From 96bfafef9bbdfc45cbc86a9627412e9572a86b89 Mon Sep 17 00:00:00 2001 From: devhl Date: Wed, 25 Mar 2026 20:39:47 -0400 Subject: [PATCH] fix possible concatentation bug --- ...arp-generichost-latest-dateTimeOffset.yaml | 2 + .../csharp/libraries/generichost/api.mustache | 2 +- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 2 +- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 2 +- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 2 +- .../src/Org.OpenAPITools/Api/APIKEYSApi.cs | 2 +- .../src/Org.OpenAPITools/Api/APIKeys0Api.cs | 2 +- .../src/Org.OpenAPITools/Api/ApiKeys1Api.cs | 2 +- .../Org.OpenAPITools.Test.csproj | 2 + .../Org.OpenAPITools/Api/AnotherFakeApi.cs | 2 +- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 12 +++--- .../src/Org.OpenAPITools/Api/FakeApi.cs | 40 +++++++++---------- .../Api/FakeClassnameTags123Api.cs | 2 +- .../src/Org.OpenAPITools/Api/PetApi.cs | 16 ++++---- .../src/Org.OpenAPITools/Api/StoreApi.cs | 8 ++-- .../src/Org.OpenAPITools/Api/UserApi.cs | 16 ++++---- .../Org.OpenAPITools/Org.OpenAPITools.csproj | 2 + .../src/Org.OpenAPITools/Api/DefaultApi.cs | 2 +- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 2 +- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 2 +- .../Org.OpenAPITools/Api/AnotherFakeApi.cs | 2 +- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 12 +++--- .../src/Org.OpenAPITools/Api/FakeApi.cs | 40 +++++++++---------- .../Api/FakeClassnameTags123Api.cs | 2 +- .../src/Org.OpenAPITools/Api/PetApi.cs | 16 ++++---- .../src/Org.OpenAPITools/Api/StoreApi.cs | 8 ++-- .../src/Org.OpenAPITools/Api/UserApi.cs | 16 ++++---- .../Org.OpenAPITools/Api/AnotherFakeApi.cs | 2 +- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 12 +++--- .../src/Org.OpenAPITools/Api/FakeApi.cs | 40 +++++++++---------- .../Api/FakeClassnameTags123Api.cs | 2 +- .../src/Org.OpenAPITools/Api/PetApi.cs | 16 ++++---- .../src/Org.OpenAPITools/Api/StoreApi.cs | 8 ++-- .../src/Org.OpenAPITools/Api/UserApi.cs | 16 ++++---- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 2 +- .../Org.OpenAPITools/Api/AnotherFakeApi.cs | 2 +- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 12 +++--- .../src/Org.OpenAPITools/Api/FakeApi.cs | 40 +++++++++---------- .../Api/FakeClassnameTags123Api.cs | 2 +- .../src/Org.OpenAPITools/Api/PetApi.cs | 16 ++++---- .../src/Org.OpenAPITools/Api/StoreApi.cs | 8 ++-- .../src/Org.OpenAPITools/Api/UserApi.cs | 16 ++++---- .../Org.OpenAPITools/Api/AnotherFakeApi.cs | 2 +- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 12 +++--- .../src/Org.OpenAPITools/Api/FakeApi.cs | 40 +++++++++---------- .../Api/FakeClassnameTags123Api.cs | 2 +- .../src/Org.OpenAPITools/Api/PetApi.cs | 16 ++++---- .../src/Org.OpenAPITools/Api/StoreApi.cs | 8 ++-- .../src/Org.OpenAPITools/Api/UserApi.cs | 16 ++++---- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 2 +- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 2 +- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 2 +- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 2 +- .../Org.OpenAPITools/Api/AnotherFakeApi.cs | 2 +- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 12 +++--- .../src/Org.OpenAPITools/Api/FakeApi.cs | 40 +++++++++---------- .../Api/FakeClassnameTags123Api.cs | 2 +- .../src/Org.OpenAPITools/Api/PetApi.cs | 16 ++++---- .../src/Org.OpenAPITools/Api/StoreApi.cs | 8 ++-- .../src/Org.OpenAPITools/Api/UserApi.cs | 16 ++++---- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 2 +- .../Org.OpenAPITools/Api/AnotherFakeApi.cs | 2 +- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 12 +++--- .../src/Org.OpenAPITools/Api/FakeApi.cs | 40 +++++++++---------- .../Api/FakeClassnameTags123Api.cs | 2 +- .../src/Org.OpenAPITools/Api/PetApi.cs | 16 ++++---- .../src/Org.OpenAPITools/Api/StoreApi.cs | 8 ++-- .../src/Org.OpenAPITools/Api/UserApi.cs | 16 ++++---- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 2 +- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 2 +- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 2 +- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 2 +- .../Org.OpenAPITools/Api/AnotherFakeApi.cs | 2 +- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 12 +++--- .../src/Org.OpenAPITools/Api/FakeApi.cs | 40 +++++++++---------- .../Api/FakeClassnameTags123Api.cs | 2 +- .../src/Org.OpenAPITools/Api/PetApi.cs | 16 ++++---- .../src/Org.OpenAPITools/Api/StoreApi.cs | 8 ++-- .../src/Org.OpenAPITools/Api/UserApi.cs | 16 ++++---- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 2 +- .../Org.OpenAPITools/Api/AnotherFakeApi.cs | 2 +- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 12 +++--- .../src/Org.OpenAPITools/Api/FakeApi.cs | 40 +++++++++---------- .../Api/FakeClassnameTags123Api.cs | 2 +- .../src/Org.OpenAPITools/Api/PetApi.cs | 16 ++++---- .../src/Org.OpenAPITools/Api/StoreApi.cs | 8 ++-- .../src/Org.OpenAPITools/Api/UserApi.cs | 16 ++++---- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 2 +- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 2 +- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 2 +- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 2 +- .../Org.OpenAPITools/Api/AnotherFakeApi.cs | 2 +- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 12 +++--- .../src/Org.OpenAPITools/Api/FakeApi.cs | 40 +++++++++---------- .../Api/FakeClassnameTags123Api.cs | 2 +- .../src/Org.OpenAPITools/Api/PetApi.cs | 16 ++++---- .../src/Org.OpenAPITools/Api/StoreApi.cs | 8 ++-- .../src/Org.OpenAPITools/Api/UserApi.cs | 16 ++++---- .../Org.OpenAPITools/Api/AnotherFakeApi.cs | 2 +- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 12 +++--- .../src/Org.OpenAPITools/Api/FakeApi.cs | 40 +++++++++---------- .../Api/FakeClassnameTags123Api.cs | 2 +- .../src/Org.OpenAPITools/Api/PetApi.cs | 16 ++++---- .../src/Org.OpenAPITools/Api/StoreApi.cs | 8 ++-- .../src/Org.OpenAPITools/Api/UserApi.cs | 16 ++++---- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 2 +- .../Org.OpenAPITools/Api/AnotherFakeApi.cs | 2 +- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 12 +++--- .../src/Org.OpenAPITools/Api/FakeApi.cs | 40 +++++++++---------- .../Api/FakeClassnameTags123Api.cs | 2 +- .../src/Org.OpenAPITools/Api/PetApi.cs | 16 ++++---- .../src/Org.OpenAPITools/Api/StoreApi.cs | 8 ++-- .../src/Org.OpenAPITools/Api/UserApi.cs | 16 ++++---- .../Org.OpenAPITools/Api/AnotherFakeApi.cs | 2 +- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 12 +++--- .../src/Org.OpenAPITools/Api/FakeApi.cs | 40 +++++++++---------- .../Api/FakeClassnameTags123Api.cs | 2 +- .../src/Org.OpenAPITools/Api/PetApi.cs | 16 ++++---- .../src/Org.OpenAPITools/Api/StoreApi.cs | 8 ++-- .../src/Org.OpenAPITools/Api/UserApi.cs | 16 ++++---- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 2 +- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 2 +- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 2 +- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 2 +- .../Org.OpenAPITools/Api/AnotherFakeApi.cs | 2 +- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 12 +++--- .../src/Org.OpenAPITools/Api/FakeApi.cs | 40 +++++++++---------- .../Api/FakeClassnameTags123Api.cs | 2 +- .../src/Org.OpenAPITools/Api/PetApi.cs | 16 ++++---- .../src/Org.OpenAPITools/Api/StoreApi.cs | 8 ++-- .../src/Org.OpenAPITools/Api/UserApi.cs | 16 ++++---- .../Org.OpenAPITools/Api/AnotherFakeApi.cs | 2 +- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 12 +++--- .../src/Org.OpenAPITools/Api/FakeApi.cs | 40 +++++++++---------- .../Api/FakeClassnameTags123Api.cs | 2 +- .../src/Org.OpenAPITools/Api/PetApi.cs | 16 ++++---- .../src/Org.OpenAPITools/Api/StoreApi.cs | 8 ++-- .../src/Org.OpenAPITools/Api/UserApi.cs | 16 ++++---- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 2 +- .../Org.OpenAPITools/Api/AnotherFakeApi.cs | 2 +- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 12 +++--- .../src/Org.OpenAPITools/Api/FakeApi.cs | 40 +++++++++---------- .../Api/FakeClassnameTags123Api.cs | 2 +- .../src/Org.OpenAPITools/Api/PetApi.cs | 16 ++++---- .../src/Org.OpenAPITools/Api/StoreApi.cs | 8 ++-- .../src/Org.OpenAPITools/Api/UserApi.cs | 16 ++++---- .../Org.OpenAPITools/Api/AnotherFakeApi.cs | 2 +- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 12 +++--- .../src/Org.OpenAPITools/Api/FakeApi.cs | 40 +++++++++---------- .../Api/FakeClassnameTags123Api.cs | 2 +- .../src/Org.OpenAPITools/Api/PetApi.cs | 16 ++++---- .../src/Org.OpenAPITools/Api/StoreApi.cs | 8 ++-- .../src/Org.OpenAPITools/Api/UserApi.cs | 16 ++++---- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 2 +- .../Org.OpenAPITools/Api/AnotherFakeApi.cs | 2 +- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 12 +++--- .../src/Org.OpenAPITools/Api/FakeApi.cs | 40 +++++++++---------- .../Api/FakeClassnameTags123Api.cs | 2 +- .../src/Org.OpenAPITools/Api/PetApi.cs | 16 ++++---- .../src/Org.OpenAPITools/Api/StoreApi.cs | 8 ++-- .../src/Org.OpenAPITools/Api/UserApi.cs | 16 ++++---- 161 files changed, 902 insertions(+), 896 deletions(-) diff --git a/bin/configs/csharp-generichost-latest-dateTimeOffset.yaml b/bin/configs/csharp-generichost-latest-dateTimeOffset.yaml index 9166739e396b..ae964cbb5101 100644 --- a/bin/configs/csharp-generichost-latest-dateTimeOffset.yaml +++ b/bin/configs/csharp-generichost-latest-dateTimeOffset.yaml @@ -8,3 +8,5 @@ additionalProperties: modelPropertySorting: alphabetical operationParameterSorting: alphabetical useDateTimeOffset: true + treatWarningsAsErrors: true + warningsNotAsErrors: CS0612 diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/api.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/api.mustache index 0a373206f991..0d86d73de3c1 100644 --- a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/api.mustache +++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/api.mustache @@ -388,7 +388,7 @@ namespace {{packageName}}.{{apiPackage}} uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "{{{path}}}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "{{{path}}}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "{{{path}}}"); {{/servers}} {{#servers}} {{#-first}} diff --git a/samples/client/petstore/csharp/generichost/latest/HelloWorld/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/latest/HelloWorld/src/Org.OpenAPITools/Api/DefaultApi.cs index 83306d5d8c47..08bee9e4dc55 100644 --- a/samples/client/petstore/csharp/generichost/latest/HelloWorld/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/latest/HelloWorld/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -246,7 +246,7 @@ public async Task HelloWorldPostAsync(Option IconsAsync(Option size uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/icons" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/icons"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/icons"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); diff --git a/samples/client/petstore/csharp/generichost/latest/OneOfList/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/latest/OneOfList/src/Org.OpenAPITools/Api/DefaultApi.cs index 6dd6e6dfa12d..48a14d7ac8e1 100644 --- a/samples/client/petstore/csharp/generichost/latest/OneOfList/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/latest/OneOfList/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -227,7 +227,7 @@ public async Task OneOfArrayAsync(Option GetApiKeysIdAsync(int id, System.Thr uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/api_keys/{id}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/api_keys/{id}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/api_keys/{id}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Bid%7D", Uri.EscapeDataString(id.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; diff --git a/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Api/APIKeys0Api.cs b/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Api/APIKeys0Api.cs index bcea8c0e180c..f20672ad6a9f 100644 --- a/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Api/APIKeys0Api.cs +++ b/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Api/APIKeys0Api.cs @@ -222,7 +222,7 @@ public async Task GetApiKeysIdAsync(int id, System.Thr uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/api_keys/{id}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/api_keys/{id}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/api_keys/{id}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Bid%7D", Uri.EscapeDataString(id.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; diff --git a/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Api/ApiKeys1Api.cs b/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Api/ApiKeys1Api.cs index 5ec7640dee6d..3ab7b63c69af 100644 --- a/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Api/ApiKeys1Api.cs +++ b/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Api/ApiKeys1Api.cs @@ -222,7 +222,7 @@ public async Task GetApiKeysIdAsync(int id, System.Thr uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/api_keys/{id}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/api_keys/{id}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/api_keys/{id}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Bid%7D", Uri.EscapeDataString(id.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; diff --git a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj index 77eea8e35f6a..7dfcfb7b0d9c 100644 --- a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj +++ b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj @@ -7,6 +7,8 @@ false enable false + true + CS0612 diff --git a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Api/AnotherFakeApi.cs index 1e622f50ec73..e108a9106564 100644 --- a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Api/AnotherFakeApi.cs +++ b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -275,7 +275,7 @@ public async Task Call123TestSpecialTagsAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/another-fake/dummy" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/another-fake/dummy"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/another-fake/dummy"); httpRequestMessageLocalVar.Content = (modelClient as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) diff --git a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Api/DefaultApi.cs index 46b798fe32ca..23e4f720a4b2 100644 --- a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -523,7 +523,7 @@ public async Task FooGetAsync(System.Threading.CancellationT uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/foo" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/foo"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/foo"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -764,7 +764,7 @@ public async Task GetCountryAsync(string country, System uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/country" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/country"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/country"); List> formParameterLocalVars = new List>(); @@ -952,7 +952,7 @@ public async Task HelloAsync(System.Threading.CancellationTok uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/hello" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/hello"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/hello"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1170,7 +1170,7 @@ public async Task RedirectOrDefaultAsync(System.T uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/redirectOrDefault" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/redirectOrDefault"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/redirectOrDefault"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1394,7 +1394,7 @@ public async Task RolesReportGetAsync(System.Threadi uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/roles/report" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/roles/report"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/roles/report"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1612,7 +1612,7 @@ public async Task TestAsync(System.Threading.CancellationToken uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/test" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/test"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/test"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; diff --git a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Api/FakeApi.cs index 24fc9409e9ec..b035dd5c9cd1 100644 --- a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Api/FakeApi.cs @@ -1373,7 +1373,7 @@ public async Task FakeHealthGetAsync(System.Threading uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/health" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/health"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/health"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1601,7 +1601,7 @@ public async Task FakeOuterBooleanSeriali uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/boolean" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/boolean"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/boolean"); if (body.IsSet) httpRequestMessageLocalVar.Content = (body.Value as object) is System.IO.Stream stream @@ -1856,7 +1856,7 @@ public async Task FakeOuterCompositeSer uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/composite" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/composite"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/composite"); if (outerComposite.IsSet) httpRequestMessageLocalVar.Content = (outerComposite.Value as object) is System.IO.Stream stream @@ -2098,7 +2098,7 @@ public async Task FakeOuterNumberSerialize uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/number" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/number"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/number"); if (body.IsSet) httpRequestMessageLocalVar.Content = (body.Value as object) is System.IO.Stream stream @@ -2359,7 +2359,7 @@ public async Task FakeOuterStringSerialize uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/string" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/string"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/string"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -2597,7 +2597,7 @@ public async Task GetArrayOfEnumsAsync(System.Threa uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/array-of-enums" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/array-of-enums"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/array-of-enums"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -2815,7 +2815,7 @@ public async Task GetMixedAnyOfAsync(System.Threading uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/mixed/anyOf" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/mixed/anyOf"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/mixed/anyOf"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -3033,7 +3033,7 @@ public async Task GetMixedOneOfAsync(System.Threading uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/mixed/oneOf" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/mixed/oneOf"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/mixed/oneOf"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -3274,7 +3274,7 @@ public async Task TestAdditionalP uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/additionalProperties-reference" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/additionalProperties-reference"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/additionalProperties-reference"); httpRequestMessageLocalVar.Content = (requestBody as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -3487,7 +3487,7 @@ public async Task TestBodyWithFileSchemaAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/body-with-file-schema" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/body-with-file-schema"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/body-with-file-schema"); httpRequestMessageLocalVar.Content = (fileSchemaTestClass as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -3710,7 +3710,7 @@ public async Task TestBodyWithQueryParamsAs uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/body-with-query-params" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/body-with-query-params"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/body-with-query-params"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -3929,7 +3929,7 @@ public async Task TestClientModelAsync(ModelClient uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); httpRequestMessageLocalVar.Content = (modelClient as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -4281,7 +4281,7 @@ public async Task TestEndpointParametersAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); List> formParameterLocalVars = new List>(); @@ -4607,7 +4607,7 @@ public async Task TestEnumParametersAsync(Option uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -4867,7 +4867,7 @@ public async Task TestGroupParametersAsync(bool uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -5096,7 +5096,7 @@ public async Task TestInlineAddition uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/inline-additionalProperties" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/inline-additionalProperties"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/inline-additionalProperties"); httpRequestMessageLocalVar.Content = (requestBody as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -5309,7 +5309,7 @@ public async Task TestInline uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/inline-freeform-additionalProperties" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/inline-freeform-additionalProperties"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/inline-freeform-additionalProperties"); httpRequestMessageLocalVar.Content = (testInlineFreeformAdditionalPropertiesRequest as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -5532,7 +5532,7 @@ public async Task TestJsonFormDataAsync(string par uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/jsonFormData" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/jsonFormData"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/jsonFormData"); List> formParameterLocalVars = new List>(); @@ -5817,7 +5817,7 @@ public async Task TestQueryParam uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/test-query-parameters" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/test-query-parameters"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/test-query-parameters"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -6035,7 +6035,7 @@ public async Task TestStringMapReferenceAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/stringMap-reference" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/stringMap-reference"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/stringMap-reference"); httpRequestMessageLocalVar.Content = (requestBody as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) diff --git a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs index 7e92a4878f40..f3ac29a27b3f 100644 --- a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs +++ b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs @@ -275,7 +275,7 @@ public async Task TestClassnameAsync(ModelClient mode uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake_classname_test" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake_classname_test"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake_classname_test"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); diff --git a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Api/PetApi.cs index 01f96fd91373..018360748fba 100644 --- a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Api/PetApi.cs +++ b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Api/PetApi.cs @@ -1075,7 +1075,7 @@ public async Task DeletePetAsync(long petId, Option FindPetsByStatusAsync(List FindPetsByTagsAsync(List t uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/pet/findByTags" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/pet/findByTags"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/pet/findByTags"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -1853,7 +1853,7 @@ public async Task GetPetByIdAsync(long petId, System.Thr uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/pet/{petId}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/pet/{petId}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/pet/{petId}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -2386,7 +2386,7 @@ public async Task UpdatePetWithFormAsync(long pet uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/pet/{petId}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/pet/{petId}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/pet/{petId}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); List> formParameterLocalVars = new List>(); @@ -2629,7 +2629,7 @@ public async Task UploadFileAsync(long petId, Option UploadFileWithRequired uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/{petId}/uploadImageWithRequiredFile" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/{petId}/uploadImageWithRequiredFile"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/{petId}/uploadImageWithRequiredFile"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); MultipartFormDataContent multipartContentLocalVar = new MultipartFormDataContent(); @@ -3203,7 +3203,7 @@ public async Task UploadFilesAsync(List DeleteOrderAsync(string orderId, Syst uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/order/{order_id}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/order/{order_id}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/order/{order_id}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Border_id%7D", Uri.EscapeDataString(orderId.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -646,7 +646,7 @@ public async Task GetInventoryAsync(System.Threading.C uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/inventory" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/inventory"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/inventory"); List tokenBaseLocalVars = new List(); ApiKeyToken apiKeyTokenLocalVar1 = (ApiKeyToken) await ApiKeyProvider.GetAsync("api-key", cancellationToken).ConfigureAwait(false); @@ -883,7 +883,7 @@ public async Task GetOrderByIdAsync(long orderId, Syst uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/order/{order_id}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/order/{order_id}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/order/{order_id}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Border_id%7D", Uri.EscapeDataString(orderId.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1138,7 +1138,7 @@ public async Task PlaceOrderAsync(Order order, System.Th uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/order" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/order"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/order"); httpRequestMessageLocalVar.Content = (order as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) diff --git a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Api/UserApi.cs index bddf0a80fe51..da4e3661c441 100644 --- a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Api/UserApi.cs +++ b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Api/UserApi.cs @@ -712,7 +712,7 @@ public async Task CreateUserAsync(User user, System.Thre uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user"); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -925,7 +925,7 @@ public async Task CreateUsersWithArrayInp uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/createWithArray" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/createWithArray"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/createWithArray"); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -1138,7 +1138,7 @@ public async Task CreateUsersWithListInput uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/createWithList" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/createWithList"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/createWithList"); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -1351,7 +1351,7 @@ public async Task DeleteUserAsync(string username, Syste uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/{username}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/{username}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/{username}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1558,7 +1558,7 @@ public async Task GetUserByNameAsync(string username, uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/{username}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/{username}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/{username}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1867,7 +1867,7 @@ public async Task LoginUserAsync(string password, string uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/login" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/login"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/login"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -2126,7 +2126,7 @@ public async Task LogoutUserAsync(System.Threading.Cance uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/logout" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/logout"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/logout"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -2336,7 +2336,7 @@ public async Task UpdateUserAsync(User user, string user uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/{username}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/{username}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/{username}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream diff --git a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Org.OpenAPITools.csproj index 864c6bc3f48b..42cd49dfe8c1 100644 --- a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Org.OpenAPITools.csproj +++ b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Org.OpenAPITools.csproj @@ -19,6 +19,8 @@ Minor update enable false + true + CS0612 diff --git a/samples/client/petstore/csharp/generichost/net10/AllOf/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net10/AllOf/src/Org.OpenAPITools/Api/DefaultApi.cs index 7742edaa18e9..6e510044ff6f 100644 --- a/samples/client/petstore/csharp/generichost/net10/AllOf/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net10/AllOf/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -240,7 +240,7 @@ public async Task ListAsync(string personId, System.Threading. uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/person/display/{personId}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/person/display/{personId}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/person/display/{personId}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpersonId%7D", Uri.EscapeDataString(personId.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; diff --git a/samples/client/petstore/csharp/generichost/net10/AnyOf/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net10/AnyOf/src/Org.OpenAPITools/Api/DefaultApi.cs index 76cd3ec1f26e..951a8589ef49 100644 --- a/samples/client/petstore/csharp/generichost/net10/AnyOf/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net10/AnyOf/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -215,7 +215,7 @@ public async Task RootGetAsync(System.Threading.Cancellatio uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; diff --git a/samples/client/petstore/csharp/generichost/net10/AnyOfNoCompare/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net10/AnyOfNoCompare/src/Org.OpenAPITools/Api/DefaultApi.cs index 76cd3ec1f26e..951a8589ef49 100644 --- a/samples/client/petstore/csharp/generichost/net10/AnyOfNoCompare/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net10/AnyOfNoCompare/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -215,7 +215,7 @@ public async Task RootGetAsync(System.Threading.Cancellatio uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/AnotherFakeApi.cs index c05e11b53887..374598ad581f 100644 --- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/AnotherFakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -273,7 +273,7 @@ public async Task Call123TestSpecialTagsAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/another-fake/dummy" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/another-fake/dummy"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/another-fake/dummy"); httpRequestMessageLocalVar.Content = (modelClient as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/DefaultApi.cs index 44d52e7e1090..5b43ed103210 100644 --- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -521,7 +521,7 @@ public async Task FooGetAsync(System.Threading.CancellationT uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/foo" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/foo"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/foo"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -762,7 +762,7 @@ public async Task GetCountryAsync(string country, System uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/country" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/country"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/country"); List> formParameterLocalVars = new List>(); @@ -950,7 +950,7 @@ public async Task HelloAsync(System.Threading.CancellationTok uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/hello" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/hello"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/hello"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1168,7 +1168,7 @@ public async Task RedirectOrDefaultAsync(System.T uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/redirectOrDefault" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/redirectOrDefault"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/redirectOrDefault"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1392,7 +1392,7 @@ public async Task RolesReportGetAsync(System.Threadi uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/roles/report" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/roles/report"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/roles/report"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1610,7 +1610,7 @@ public async Task TestAsync(System.Threading.CancellationToken uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/test" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/test"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/test"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs index 0070617289e6..8a489ed1f3f3 100644 --- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs @@ -1371,7 +1371,7 @@ public async Task FakeHealthGetAsync(System.Threading uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/health" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/health"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/health"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1599,7 +1599,7 @@ public async Task FakeOuterBooleanSeriali uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/boolean" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/boolean"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/boolean"); if (body.IsSet) httpRequestMessageLocalVar.Content = (body.Value as object) is System.IO.Stream stream @@ -1854,7 +1854,7 @@ public async Task FakeOuterCompositeSer uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/composite" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/composite"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/composite"); if (outerComposite.IsSet) httpRequestMessageLocalVar.Content = (outerComposite.Value as object) is System.IO.Stream stream @@ -2096,7 +2096,7 @@ public async Task FakeOuterNumberSerialize uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/number" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/number"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/number"); if (body.IsSet) httpRequestMessageLocalVar.Content = (body.Value as object) is System.IO.Stream stream @@ -2357,7 +2357,7 @@ public async Task FakeOuterStringSerialize uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/string" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/string"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/string"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -2595,7 +2595,7 @@ public async Task GetArrayOfEnumsAsync(System.Threa uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/array-of-enums" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/array-of-enums"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/array-of-enums"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -2813,7 +2813,7 @@ public async Task GetMixedAnyOfAsync(System.Threading uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/mixed/anyOf" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/mixed/anyOf"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/mixed/anyOf"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -3031,7 +3031,7 @@ public async Task GetMixedOneOfAsync(System.Threading uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/mixed/oneOf" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/mixed/oneOf"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/mixed/oneOf"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -3272,7 +3272,7 @@ public async Task TestAdditionalP uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/additionalProperties-reference" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/additionalProperties-reference"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/additionalProperties-reference"); httpRequestMessageLocalVar.Content = (requestBody as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -3485,7 +3485,7 @@ public async Task TestBodyWithFileSchemaAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/body-with-file-schema" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/body-with-file-schema"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/body-with-file-schema"); httpRequestMessageLocalVar.Content = (fileSchemaTestClass as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -3708,7 +3708,7 @@ public async Task TestBodyWithQueryParamsAs uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/body-with-query-params" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/body-with-query-params"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/body-with-query-params"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -3927,7 +3927,7 @@ public async Task TestClientModelAsync(ModelClient uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); httpRequestMessageLocalVar.Content = (modelClient as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -4279,7 +4279,7 @@ public async Task TestEndpointParametersAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); List> formParameterLocalVars = new List>(); @@ -4593,7 +4593,7 @@ public async Task TestEnumParametersAsync(Option uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -4853,7 +4853,7 @@ public async Task TestGroupParametersAsync(bool uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -5082,7 +5082,7 @@ public async Task TestInlineAddition uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/inline-additionalProperties" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/inline-additionalProperties"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/inline-additionalProperties"); httpRequestMessageLocalVar.Content = (requestBody as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -5295,7 +5295,7 @@ public async Task TestInline uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/inline-freeform-additionalProperties" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/inline-freeform-additionalProperties"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/inline-freeform-additionalProperties"); httpRequestMessageLocalVar.Content = (testInlineFreeformAdditionalPropertiesRequest as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -5518,7 +5518,7 @@ public async Task TestJsonFormDataAsync(string par uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/jsonFormData" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/jsonFormData"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/jsonFormData"); List> formParameterLocalVars = new List>(); @@ -5803,7 +5803,7 @@ public async Task TestQueryParam uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/test-query-parameters" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/test-query-parameters"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/test-query-parameters"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -6021,7 +6021,7 @@ public async Task TestStringMapReferenceAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/stringMap-reference" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/stringMap-reference"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/stringMap-reference"); httpRequestMessageLocalVar.Content = (requestBody as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs index b806d5e1d0e5..802d1fdb2ac1 100644 --- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs +++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs @@ -273,7 +273,7 @@ public async Task TestClassnameAsync(ModelClient mode uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake_classname_test" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake_classname_test"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake_classname_test"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/PetApi.cs index aa542fd9c05b..b49539f512bb 100644 --- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/PetApi.cs +++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/PetApi.cs @@ -1073,7 +1073,7 @@ public async Task DeletePetAsync(long petId, Option FindPetsByStatusAsync(List FindPetsByTagsAsync(List t uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/pet/findByTags" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/pet/findByTags"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/pet/findByTags"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -1851,7 +1851,7 @@ public async Task GetPetByIdAsync(long petId, System.Thr uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/pet/{petId}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/pet/{petId}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/pet/{petId}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -2384,7 +2384,7 @@ public async Task UpdatePetWithFormAsync(long pet uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/pet/{petId}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/pet/{petId}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/pet/{petId}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); List> formParameterLocalVars = new List>(); @@ -2627,7 +2627,7 @@ public async Task UploadFileAsync(long petId, Option UploadFileWithRequired uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/{petId}/uploadImageWithRequiredFile" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/{petId}/uploadImageWithRequiredFile"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/{petId}/uploadImageWithRequiredFile"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); MultipartFormDataContent multipartContentLocalVar = new MultipartFormDataContent(); @@ -3201,7 +3201,7 @@ public async Task UploadFilesAsync(List DeleteOrderAsync(string orderId, Syst uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/order/{order_id}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/order/{order_id}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/order/{order_id}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Border_id%7D", Uri.EscapeDataString(orderId.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -644,7 +644,7 @@ public async Task GetInventoryAsync(System.Threading.C uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/inventory" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/inventory"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/inventory"); List tokenBaseLocalVars = new List(); ApiKeyToken apiKeyTokenLocalVar1 = (ApiKeyToken) await ApiKeyProvider.GetAsync("api-key", cancellationToken).ConfigureAwait(false); @@ -881,7 +881,7 @@ public async Task GetOrderByIdAsync(long orderId, Syst uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/order/{order_id}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/order/{order_id}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/order/{order_id}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Border_id%7D", Uri.EscapeDataString(orderId.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1136,7 +1136,7 @@ public async Task PlaceOrderAsync(Order order, System.Th uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/order" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/order"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/order"); httpRequestMessageLocalVar.Content = (order as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/UserApi.cs index e92a66b21b73..c6802990ffc6 100644 --- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/UserApi.cs +++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/UserApi.cs @@ -710,7 +710,7 @@ public async Task CreateUserAsync(User user, System.Thre uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user"); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -923,7 +923,7 @@ public async Task CreateUsersWithArrayInp uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/createWithArray" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/createWithArray"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/createWithArray"); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -1136,7 +1136,7 @@ public async Task CreateUsersWithListInput uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/createWithList" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/createWithList"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/createWithList"); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -1349,7 +1349,7 @@ public async Task DeleteUserAsync(string username, Syste uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/{username}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/{username}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/{username}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1556,7 +1556,7 @@ public async Task GetUserByNameAsync(string username, uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/{username}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/{username}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/{username}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1865,7 +1865,7 @@ public async Task LoginUserAsync(string password, string uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/login" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/login"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/login"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -2124,7 +2124,7 @@ public async Task LogoutUserAsync(System.Threading.Cance uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/logout" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/logout"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/logout"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -2334,7 +2334,7 @@ public async Task UpdateUserAsync(User user, string user uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/{username}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/{username}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/{username}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream diff --git a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Api/AnotherFakeApi.cs index 1e622f50ec73..e108a9106564 100644 --- a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Api/AnotherFakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -275,7 +275,7 @@ public async Task Call123TestSpecialTagsAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/another-fake/dummy" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/another-fake/dummy"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/another-fake/dummy"); httpRequestMessageLocalVar.Content = (modelClient as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) diff --git a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Api/DefaultApi.cs index 46b798fe32ca..23e4f720a4b2 100644 --- a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -523,7 +523,7 @@ public async Task FooGetAsync(System.Threading.CancellationT uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/foo" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/foo"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/foo"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -764,7 +764,7 @@ public async Task GetCountryAsync(string country, System uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/country" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/country"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/country"); List> formParameterLocalVars = new List>(); @@ -952,7 +952,7 @@ public async Task HelloAsync(System.Threading.CancellationTok uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/hello" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/hello"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/hello"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1170,7 +1170,7 @@ public async Task RedirectOrDefaultAsync(System.T uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/redirectOrDefault" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/redirectOrDefault"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/redirectOrDefault"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1394,7 +1394,7 @@ public async Task RolesReportGetAsync(System.Threadi uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/roles/report" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/roles/report"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/roles/report"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1612,7 +1612,7 @@ public async Task TestAsync(System.Threading.CancellationToken uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/test" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/test"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/test"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; diff --git a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Api/FakeApi.cs index 54a1c8c85360..7504f8b34bca 100644 --- a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Api/FakeApi.cs @@ -1373,7 +1373,7 @@ public async Task FakeHealthGetAsync(System.Threading uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/health" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/health"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/health"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1601,7 +1601,7 @@ public async Task FakeOuterBooleanSeriali uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/boolean" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/boolean"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/boolean"); if (body.IsSet) httpRequestMessageLocalVar.Content = (body.Value as object) is System.IO.Stream stream @@ -1856,7 +1856,7 @@ public async Task FakeOuterCompositeSer uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/composite" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/composite"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/composite"); if (outerComposite.IsSet) httpRequestMessageLocalVar.Content = (outerComposite.Value as object) is System.IO.Stream stream @@ -2098,7 +2098,7 @@ public async Task FakeOuterNumberSerialize uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/number" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/number"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/number"); if (body.IsSet) httpRequestMessageLocalVar.Content = (body.Value as object) is System.IO.Stream stream @@ -2359,7 +2359,7 @@ public async Task FakeOuterStringSerialize uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/string" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/string"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/string"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -2597,7 +2597,7 @@ public async Task GetArrayOfEnumsAsync(System.Threa uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/array-of-enums" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/array-of-enums"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/array-of-enums"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -2815,7 +2815,7 @@ public async Task GetMixedAnyOfAsync(System.Threading uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/mixed/anyOf" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/mixed/anyOf"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/mixed/anyOf"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -3033,7 +3033,7 @@ public async Task GetMixedOneOfAsync(System.Threading uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/mixed/oneOf" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/mixed/oneOf"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/mixed/oneOf"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -3274,7 +3274,7 @@ public async Task TestAdditionalP uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/additionalProperties-reference" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/additionalProperties-reference"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/additionalProperties-reference"); httpRequestMessageLocalVar.Content = (requestBody as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -3487,7 +3487,7 @@ public async Task TestBodyWithFileSchemaAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/body-with-file-schema" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/body-with-file-schema"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/body-with-file-schema"); httpRequestMessageLocalVar.Content = (fileSchemaTestClass as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -3710,7 +3710,7 @@ public async Task TestBodyWithQueryParamsAs uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/body-with-query-params" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/body-with-query-params"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/body-with-query-params"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -3929,7 +3929,7 @@ public async Task TestClientModelAsync(ModelClient uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); httpRequestMessageLocalVar.Content = (modelClient as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -4281,7 +4281,7 @@ public async Task TestEndpointParametersAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); List> formParameterLocalVars = new List>(); @@ -4607,7 +4607,7 @@ public async Task TestEnumParametersAsync(Option uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -4867,7 +4867,7 @@ public async Task TestGroupParametersAsync(bool uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -5096,7 +5096,7 @@ public async Task TestInlineAddition uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/inline-additionalProperties" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/inline-additionalProperties"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/inline-additionalProperties"); httpRequestMessageLocalVar.Content = (requestBody as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -5309,7 +5309,7 @@ public async Task TestInline uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/inline-freeform-additionalProperties" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/inline-freeform-additionalProperties"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/inline-freeform-additionalProperties"); httpRequestMessageLocalVar.Content = (testInlineFreeformAdditionalPropertiesRequest as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -5532,7 +5532,7 @@ public async Task TestJsonFormDataAsync(string par uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/jsonFormData" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/jsonFormData"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/jsonFormData"); List> formParameterLocalVars = new List>(); @@ -5817,7 +5817,7 @@ public async Task TestQueryParam uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/test-query-parameters" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/test-query-parameters"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/test-query-parameters"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -6035,7 +6035,7 @@ public async Task TestStringMapReferenceAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/stringMap-reference" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/stringMap-reference"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/stringMap-reference"); httpRequestMessageLocalVar.Content = (requestBody as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) diff --git a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs index 7e92a4878f40..f3ac29a27b3f 100644 --- a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs +++ b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs @@ -275,7 +275,7 @@ public async Task TestClassnameAsync(ModelClient mode uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake_classname_test" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake_classname_test"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake_classname_test"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); diff --git a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Api/PetApi.cs index 01f96fd91373..018360748fba 100644 --- a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Api/PetApi.cs +++ b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Api/PetApi.cs @@ -1075,7 +1075,7 @@ public async Task DeletePetAsync(long petId, Option FindPetsByStatusAsync(List FindPetsByTagsAsync(List t uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/pet/findByTags" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/pet/findByTags"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/pet/findByTags"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -1853,7 +1853,7 @@ public async Task GetPetByIdAsync(long petId, System.Thr uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/pet/{petId}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/pet/{petId}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/pet/{petId}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -2386,7 +2386,7 @@ public async Task UpdatePetWithFormAsync(long pet uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/pet/{petId}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/pet/{petId}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/pet/{petId}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); List> formParameterLocalVars = new List>(); @@ -2629,7 +2629,7 @@ public async Task UploadFileAsync(long petId, Option UploadFileWithRequired uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/{petId}/uploadImageWithRequiredFile" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/{petId}/uploadImageWithRequiredFile"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/{petId}/uploadImageWithRequiredFile"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); MultipartFormDataContent multipartContentLocalVar = new MultipartFormDataContent(); @@ -3203,7 +3203,7 @@ public async Task UploadFilesAsync(List DeleteOrderAsync(string orderId, Syst uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/order/{order_id}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/order/{order_id}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/order/{order_id}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Border_id%7D", Uri.EscapeDataString(orderId.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -646,7 +646,7 @@ public async Task GetInventoryAsync(System.Threading.C uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/inventory" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/inventory"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/inventory"); List tokenBaseLocalVars = new List(); ApiKeyToken apiKeyTokenLocalVar1 = (ApiKeyToken) await ApiKeyProvider.GetAsync("api-key", cancellationToken).ConfigureAwait(false); @@ -883,7 +883,7 @@ public async Task GetOrderByIdAsync(long orderId, Syst uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/order/{order_id}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/order/{order_id}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/order/{order_id}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Border_id%7D", Uri.EscapeDataString(orderId.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1138,7 +1138,7 @@ public async Task PlaceOrderAsync(Order order, System.Th uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/order" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/order"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/order"); httpRequestMessageLocalVar.Content = (order as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) diff --git a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Api/UserApi.cs index bddf0a80fe51..da4e3661c441 100644 --- a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Api/UserApi.cs +++ b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Api/UserApi.cs @@ -712,7 +712,7 @@ public async Task CreateUserAsync(User user, System.Thre uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user"); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -925,7 +925,7 @@ public async Task CreateUsersWithArrayInp uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/createWithArray" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/createWithArray"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/createWithArray"); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -1138,7 +1138,7 @@ public async Task CreateUsersWithListInput uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/createWithList" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/createWithList"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/createWithList"); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -1351,7 +1351,7 @@ public async Task DeleteUserAsync(string username, Syste uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/{username}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/{username}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/{username}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1558,7 +1558,7 @@ public async Task GetUserByNameAsync(string username, uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/{username}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/{username}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/{username}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1867,7 +1867,7 @@ public async Task LoginUserAsync(string password, string uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/login" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/login"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/login"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -2126,7 +2126,7 @@ public async Task LogoutUserAsync(System.Threading.Cance uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/logout" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/logout"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/logout"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -2336,7 +2336,7 @@ public async Task UpdateUserAsync(User user, string user uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/{username}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/{username}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/{username}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream diff --git a/samples/client/petstore/csharp/generichost/net10/OneOf/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net10/OneOf/src/Org.OpenAPITools/Api/DefaultApi.cs index 76cd3ec1f26e..951a8589ef49 100644 --- a/samples/client/petstore/csharp/generichost/net10/OneOf/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net10/OneOf/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -215,7 +215,7 @@ public async Task RootGetAsync(System.Threading.Cancellatio uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; diff --git a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs index c05e11b53887..374598ad581f 100644 --- a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -273,7 +273,7 @@ public async Task Call123TestSpecialTagsAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/another-fake/dummy" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/another-fake/dummy"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/another-fake/dummy"); httpRequestMessageLocalVar.Content = (modelClient as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) diff --git a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Api/DefaultApi.cs index 44d52e7e1090..5b43ed103210 100644 --- a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -521,7 +521,7 @@ public async Task FooGetAsync(System.Threading.CancellationT uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/foo" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/foo"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/foo"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -762,7 +762,7 @@ public async Task GetCountryAsync(string country, System uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/country" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/country"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/country"); List> formParameterLocalVars = new List>(); @@ -950,7 +950,7 @@ public async Task HelloAsync(System.Threading.CancellationTok uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/hello" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/hello"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/hello"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1168,7 +1168,7 @@ public async Task RedirectOrDefaultAsync(System.T uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/redirectOrDefault" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/redirectOrDefault"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/redirectOrDefault"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1392,7 +1392,7 @@ public async Task RolesReportGetAsync(System.Threadi uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/roles/report" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/roles/report"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/roles/report"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1610,7 +1610,7 @@ public async Task TestAsync(System.Threading.CancellationToken uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/test" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/test"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/test"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; diff --git a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs index 482421f8c4ea..271fbfea2636 100644 --- a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs @@ -1371,7 +1371,7 @@ public async Task FakeHealthGetAsync(System.Threading uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/health" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/health"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/health"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1599,7 +1599,7 @@ public async Task FakeOuterBooleanSeriali uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/boolean" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/boolean"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/boolean"); if (body.IsSet) httpRequestMessageLocalVar.Content = (body.Value as object) is System.IO.Stream stream @@ -1854,7 +1854,7 @@ public async Task FakeOuterCompositeSer uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/composite" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/composite"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/composite"); if (outerComposite.IsSet) httpRequestMessageLocalVar.Content = (outerComposite.Value as object) is System.IO.Stream stream @@ -2096,7 +2096,7 @@ public async Task FakeOuterNumberSerialize uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/number" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/number"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/number"); if (body.IsSet) httpRequestMessageLocalVar.Content = (body.Value as object) is System.IO.Stream stream @@ -2357,7 +2357,7 @@ public async Task FakeOuterStringSerialize uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/string" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/string"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/string"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -2595,7 +2595,7 @@ public async Task GetArrayOfEnumsAsync(System.Threa uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/array-of-enums" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/array-of-enums"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/array-of-enums"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -2813,7 +2813,7 @@ public async Task GetMixedAnyOfAsync(System.Threading uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/mixed/anyOf" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/mixed/anyOf"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/mixed/anyOf"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -3031,7 +3031,7 @@ public async Task GetMixedOneOfAsync(System.Threading uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/mixed/oneOf" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/mixed/oneOf"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/mixed/oneOf"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -3272,7 +3272,7 @@ public async Task TestAdditionalP uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/additionalProperties-reference" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/additionalProperties-reference"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/additionalProperties-reference"); httpRequestMessageLocalVar.Content = (requestBody as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -3485,7 +3485,7 @@ public async Task TestBodyWithFileSchemaAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/body-with-file-schema" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/body-with-file-schema"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/body-with-file-schema"); httpRequestMessageLocalVar.Content = (fileSchemaTestClass as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -3708,7 +3708,7 @@ public async Task TestBodyWithQueryParamsAs uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/body-with-query-params" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/body-with-query-params"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/body-with-query-params"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -3927,7 +3927,7 @@ public async Task TestClientModelAsync(ModelClient uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); httpRequestMessageLocalVar.Content = (modelClient as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -4279,7 +4279,7 @@ public async Task TestEndpointParametersAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); List> formParameterLocalVars = new List>(); @@ -4605,7 +4605,7 @@ public async Task TestEnumParametersAsync(Option uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -4865,7 +4865,7 @@ public async Task TestGroupParametersAsync(bool uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -5094,7 +5094,7 @@ public async Task TestInlineAddition uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/inline-additionalProperties" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/inline-additionalProperties"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/inline-additionalProperties"); httpRequestMessageLocalVar.Content = (requestBody as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -5307,7 +5307,7 @@ public async Task TestInline uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/inline-freeform-additionalProperties" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/inline-freeform-additionalProperties"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/inline-freeform-additionalProperties"); httpRequestMessageLocalVar.Content = (testInlineFreeformAdditionalPropertiesRequest as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -5530,7 +5530,7 @@ public async Task TestJsonFormDataAsync(string par uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/jsonFormData" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/jsonFormData"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/jsonFormData"); List> formParameterLocalVars = new List>(); @@ -5815,7 +5815,7 @@ public async Task TestQueryParam uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/test-query-parameters" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/test-query-parameters"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/test-query-parameters"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -6033,7 +6033,7 @@ public async Task TestStringMapReferenceAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/stringMap-reference" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/stringMap-reference"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/stringMap-reference"); httpRequestMessageLocalVar.Content = (requestBody as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) diff --git a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs index b806d5e1d0e5..802d1fdb2ac1 100644 --- a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs +++ b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs @@ -273,7 +273,7 @@ public async Task TestClassnameAsync(ModelClient mode uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake_classname_test" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake_classname_test"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake_classname_test"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); diff --git a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Api/PetApi.cs index 20f9ce2ce945..4e99649609ef 100644 --- a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Api/PetApi.cs +++ b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Api/PetApi.cs @@ -1073,7 +1073,7 @@ public async Task DeletePetAsync(long petId, Option FindPetsByStatusAsync(List FindPetsByTagsAsync(List t uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/pet/findByTags" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/pet/findByTags"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/pet/findByTags"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -1851,7 +1851,7 @@ public async Task GetPetByIdAsync(long petId, System.Thr uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/pet/{petId}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/pet/{petId}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/pet/{petId}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -2384,7 +2384,7 @@ public async Task UpdatePetWithFormAsync(long pet uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/pet/{petId}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/pet/{petId}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/pet/{petId}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); List> formParameterLocalVars = new List>(); @@ -2627,7 +2627,7 @@ public async Task UploadFileAsync(long petId, Option UploadFileWithRequired uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/{petId}/uploadImageWithRequiredFile" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/{petId}/uploadImageWithRequiredFile"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/{petId}/uploadImageWithRequiredFile"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); MultipartFormDataContent multipartContentLocalVar = new MultipartFormDataContent(); @@ -3201,7 +3201,7 @@ public async Task UploadFilesAsync(List DeleteOrderAsync(string orderId, Syst uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/order/{order_id}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/order/{order_id}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/order/{order_id}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Border_id%7D", Uri.EscapeDataString(orderId.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -644,7 +644,7 @@ public async Task GetInventoryAsync(System.Threading.C uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/inventory" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/inventory"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/inventory"); List tokenBaseLocalVars = new List(); ApiKeyToken apiKeyTokenLocalVar1 = (ApiKeyToken) await ApiKeyProvider.GetAsync("api-key", cancellationToken).ConfigureAwait(false); @@ -881,7 +881,7 @@ public async Task GetOrderByIdAsync(long orderId, Syst uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/order/{order_id}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/order/{order_id}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/order/{order_id}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Border_id%7D", Uri.EscapeDataString(orderId.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1136,7 +1136,7 @@ public async Task PlaceOrderAsync(Order order, System.Th uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/order" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/order"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/order"); httpRequestMessageLocalVar.Content = (order as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) diff --git a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Api/UserApi.cs index e92a66b21b73..c6802990ffc6 100644 --- a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Api/UserApi.cs +++ b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Api/UserApi.cs @@ -710,7 +710,7 @@ public async Task CreateUserAsync(User user, System.Thre uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user"); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -923,7 +923,7 @@ public async Task CreateUsersWithArrayInp uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/createWithArray" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/createWithArray"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/createWithArray"); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -1136,7 +1136,7 @@ public async Task CreateUsersWithListInput uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/createWithList" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/createWithList"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/createWithList"); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -1349,7 +1349,7 @@ public async Task DeleteUserAsync(string username, Syste uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/{username}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/{username}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/{username}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1556,7 +1556,7 @@ public async Task GetUserByNameAsync(string username, uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/{username}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/{username}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/{username}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1865,7 +1865,7 @@ public async Task LoginUserAsync(string password, string uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/login" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/login"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/login"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -2124,7 +2124,7 @@ public async Task LogoutUserAsync(System.Threading.Cance uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/logout" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/logout"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/logout"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -2334,7 +2334,7 @@ public async Task UpdateUserAsync(User user, string user uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/{username}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/{username}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/{username}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream diff --git a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Api/AnotherFakeApi.cs index 1e622f50ec73..e108a9106564 100644 --- a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Api/AnotherFakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -275,7 +275,7 @@ public async Task Call123TestSpecialTagsAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/another-fake/dummy" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/another-fake/dummy"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/another-fake/dummy"); httpRequestMessageLocalVar.Content = (modelClient as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) diff --git a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Api/DefaultApi.cs index 46b798fe32ca..23e4f720a4b2 100644 --- a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -523,7 +523,7 @@ public async Task FooGetAsync(System.Threading.CancellationT uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/foo" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/foo"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/foo"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -764,7 +764,7 @@ public async Task GetCountryAsync(string country, System uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/country" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/country"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/country"); List> formParameterLocalVars = new List>(); @@ -952,7 +952,7 @@ public async Task HelloAsync(System.Threading.CancellationTok uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/hello" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/hello"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/hello"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1170,7 +1170,7 @@ public async Task RedirectOrDefaultAsync(System.T uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/redirectOrDefault" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/redirectOrDefault"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/redirectOrDefault"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1394,7 +1394,7 @@ public async Task RolesReportGetAsync(System.Threadi uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/roles/report" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/roles/report"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/roles/report"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1612,7 +1612,7 @@ public async Task TestAsync(System.Threading.CancellationToken uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/test" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/test"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/test"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; diff --git a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Api/FakeApi.cs index 54a1c8c85360..7504f8b34bca 100644 --- a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Api/FakeApi.cs @@ -1373,7 +1373,7 @@ public async Task FakeHealthGetAsync(System.Threading uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/health" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/health"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/health"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1601,7 +1601,7 @@ public async Task FakeOuterBooleanSeriali uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/boolean" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/boolean"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/boolean"); if (body.IsSet) httpRequestMessageLocalVar.Content = (body.Value as object) is System.IO.Stream stream @@ -1856,7 +1856,7 @@ public async Task FakeOuterCompositeSer uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/composite" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/composite"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/composite"); if (outerComposite.IsSet) httpRequestMessageLocalVar.Content = (outerComposite.Value as object) is System.IO.Stream stream @@ -2098,7 +2098,7 @@ public async Task FakeOuterNumberSerialize uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/number" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/number"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/number"); if (body.IsSet) httpRequestMessageLocalVar.Content = (body.Value as object) is System.IO.Stream stream @@ -2359,7 +2359,7 @@ public async Task FakeOuterStringSerialize uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/string" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/string"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/string"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -2597,7 +2597,7 @@ public async Task GetArrayOfEnumsAsync(System.Threa uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/array-of-enums" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/array-of-enums"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/array-of-enums"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -2815,7 +2815,7 @@ public async Task GetMixedAnyOfAsync(System.Threading uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/mixed/anyOf" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/mixed/anyOf"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/mixed/anyOf"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -3033,7 +3033,7 @@ public async Task GetMixedOneOfAsync(System.Threading uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/mixed/oneOf" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/mixed/oneOf"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/mixed/oneOf"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -3274,7 +3274,7 @@ public async Task TestAdditionalP uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/additionalProperties-reference" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/additionalProperties-reference"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/additionalProperties-reference"); httpRequestMessageLocalVar.Content = (requestBody as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -3487,7 +3487,7 @@ public async Task TestBodyWithFileSchemaAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/body-with-file-schema" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/body-with-file-schema"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/body-with-file-schema"); httpRequestMessageLocalVar.Content = (fileSchemaTestClass as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -3710,7 +3710,7 @@ public async Task TestBodyWithQueryParamsAs uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/body-with-query-params" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/body-with-query-params"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/body-with-query-params"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -3929,7 +3929,7 @@ public async Task TestClientModelAsync(ModelClient uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); httpRequestMessageLocalVar.Content = (modelClient as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -4281,7 +4281,7 @@ public async Task TestEndpointParametersAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); List> formParameterLocalVars = new List>(); @@ -4607,7 +4607,7 @@ public async Task TestEnumParametersAsync(Option uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -4867,7 +4867,7 @@ public async Task TestGroupParametersAsync(bool uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -5096,7 +5096,7 @@ public async Task TestInlineAddition uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/inline-additionalProperties" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/inline-additionalProperties"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/inline-additionalProperties"); httpRequestMessageLocalVar.Content = (requestBody as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -5309,7 +5309,7 @@ public async Task TestInline uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/inline-freeform-additionalProperties" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/inline-freeform-additionalProperties"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/inline-freeform-additionalProperties"); httpRequestMessageLocalVar.Content = (testInlineFreeformAdditionalPropertiesRequest as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -5532,7 +5532,7 @@ public async Task TestJsonFormDataAsync(string par uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/jsonFormData" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/jsonFormData"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/jsonFormData"); List> formParameterLocalVars = new List>(); @@ -5817,7 +5817,7 @@ public async Task TestQueryParam uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/test-query-parameters" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/test-query-parameters"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/test-query-parameters"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -6035,7 +6035,7 @@ public async Task TestStringMapReferenceAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/stringMap-reference" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/stringMap-reference"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/stringMap-reference"); httpRequestMessageLocalVar.Content = (requestBody as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) diff --git a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs index 7e92a4878f40..f3ac29a27b3f 100644 --- a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs +++ b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs @@ -275,7 +275,7 @@ public async Task TestClassnameAsync(ModelClient mode uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake_classname_test" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake_classname_test"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake_classname_test"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); diff --git a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Api/PetApi.cs index 01f96fd91373..018360748fba 100644 --- a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Api/PetApi.cs +++ b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Api/PetApi.cs @@ -1075,7 +1075,7 @@ public async Task DeletePetAsync(long petId, Option FindPetsByStatusAsync(List FindPetsByTagsAsync(List t uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/pet/findByTags" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/pet/findByTags"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/pet/findByTags"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -1853,7 +1853,7 @@ public async Task GetPetByIdAsync(long petId, System.Thr uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/pet/{petId}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/pet/{petId}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/pet/{petId}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -2386,7 +2386,7 @@ public async Task UpdatePetWithFormAsync(long pet uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/pet/{petId}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/pet/{petId}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/pet/{petId}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); List> formParameterLocalVars = new List>(); @@ -2629,7 +2629,7 @@ public async Task UploadFileAsync(long petId, Option UploadFileWithRequired uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/{petId}/uploadImageWithRequiredFile" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/{petId}/uploadImageWithRequiredFile"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/{petId}/uploadImageWithRequiredFile"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); MultipartFormDataContent multipartContentLocalVar = new MultipartFormDataContent(); @@ -3203,7 +3203,7 @@ public async Task UploadFilesAsync(List DeleteOrderAsync(string orderId, Syst uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/order/{order_id}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/order/{order_id}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/order/{order_id}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Border_id%7D", Uri.EscapeDataString(orderId.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -646,7 +646,7 @@ public async Task GetInventoryAsync(System.Threading.C uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/inventory" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/inventory"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/inventory"); List tokenBaseLocalVars = new List(); ApiKeyToken apiKeyTokenLocalVar1 = (ApiKeyToken) await ApiKeyProvider.GetAsync("api-key", cancellationToken).ConfigureAwait(false); @@ -883,7 +883,7 @@ public async Task GetOrderByIdAsync(long orderId, Syst uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/order/{order_id}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/order/{order_id}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/order/{order_id}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Border_id%7D", Uri.EscapeDataString(orderId.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1138,7 +1138,7 @@ public async Task PlaceOrderAsync(Order order, System.Th uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/order" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/order"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/order"); httpRequestMessageLocalVar.Content = (order as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) diff --git a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Api/UserApi.cs index bddf0a80fe51..da4e3661c441 100644 --- a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Api/UserApi.cs +++ b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Api/UserApi.cs @@ -712,7 +712,7 @@ public async Task CreateUserAsync(User user, System.Thre uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user"); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -925,7 +925,7 @@ public async Task CreateUsersWithArrayInp uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/createWithArray" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/createWithArray"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/createWithArray"); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -1138,7 +1138,7 @@ public async Task CreateUsersWithListInput uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/createWithList" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/createWithList"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/createWithList"); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -1351,7 +1351,7 @@ public async Task DeleteUserAsync(string username, Syste uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/{username}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/{username}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/{username}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1558,7 +1558,7 @@ public async Task GetUserByNameAsync(string username, uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/{username}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/{username}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/{username}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1867,7 +1867,7 @@ public async Task LoginUserAsync(string password, string uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/login" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/login"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/login"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -2126,7 +2126,7 @@ public async Task LogoutUserAsync(System.Threading.Cance uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/logout" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/logout"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/logout"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -2336,7 +2336,7 @@ public async Task UpdateUserAsync(User user, string user uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/{username}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/{username}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/{username}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream diff --git a/samples/client/petstore/csharp/generichost/net10/UseDateTimeForDate/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net10/UseDateTimeForDate/src/Org.OpenAPITools/Api/DefaultApi.cs index e365df34a61b..5c7e087ff74a 100644 --- a/samples/client/petstore/csharp/generichost/net10/UseDateTimeForDate/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net10/UseDateTimeForDate/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -215,7 +215,7 @@ public async Task NowGetAsync(System.Threading.CancellationT uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/now" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/now"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/now"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; diff --git a/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Api/DefaultApi.cs index c054b04da9ff..3745f6dafbf5 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -238,7 +238,7 @@ public async Task ListAsync(string personId, System.Threading. uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/person/display/{personId}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/person/display/{personId}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/person/display/{personId}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpersonId%7D", Uri.EscapeDataString(personId.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; diff --git a/samples/client/petstore/csharp/generichost/net4.7/AnyOf/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net4.7/AnyOf/src/Org.OpenAPITools/Api/DefaultApi.cs index b55767b337b1..24454e8f663a 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/AnyOf/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/AnyOf/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -213,7 +213,7 @@ public async Task RootGetAsync(System.Threading.Cancellatio uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; diff --git a/samples/client/petstore/csharp/generichost/net4.7/AnyOfNoCompare/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net4.7/AnyOfNoCompare/src/Org.OpenAPITools/Api/DefaultApi.cs index b55767b337b1..24454e8f663a 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/AnyOfNoCompare/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/AnyOfNoCompare/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -213,7 +213,7 @@ public async Task RootGetAsync(System.Threading.Cancellatio uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/AnotherFakeApi.cs index 58e90074f17b..7eeebe9c25d2 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/AnotherFakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -273,7 +273,7 @@ public async Task Call123TestSpecialTagsAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/another-fake/dummy" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/another-fake/dummy"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/another-fake/dummy"); httpRequestMessageLocalVar.Content = (modelClient as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/DefaultApi.cs index 24a69b84527e..9750887d4beb 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -521,7 +521,7 @@ public async Task FooGetAsync(System.Threading.CancellationT uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/foo" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/foo"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/foo"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -761,7 +761,7 @@ public async Task GetCountryAsync(string country, System uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/country" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/country"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/country"); List> formParameterLocalVars = new List>(); @@ -949,7 +949,7 @@ public async Task HelloAsync(System.Threading.CancellationTok uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/hello" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/hello"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/hello"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1166,7 +1166,7 @@ public async Task RedirectOrDefaultAsync(System.T uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/redirectOrDefault" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/redirectOrDefault"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/redirectOrDefault"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1389,7 +1389,7 @@ public async Task RolesReportGetAsync(System.Threadi uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/roles/report" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/roles/report"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/roles/report"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1606,7 +1606,7 @@ public async Task TestAsync(System.Threading.CancellationToken uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/test" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/test"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/test"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs index 9f2605d1777f..98684187061c 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs @@ -1371,7 +1371,7 @@ public async Task FakeHealthGetAsync(System.Threading uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/health" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/health"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/health"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1598,7 +1598,7 @@ public async Task FakeOuterBooleanSeriali uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/boolean" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/boolean"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/boolean"); if (body.IsSet) httpRequestMessageLocalVar.Content = (body.Value as object) is System.IO.Stream stream @@ -1852,7 +1852,7 @@ public async Task FakeOuterCompositeSer uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/composite" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/composite"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/composite"); if (outerComposite.IsSet) httpRequestMessageLocalVar.Content = (outerComposite.Value as object) is System.IO.Stream stream @@ -2093,7 +2093,7 @@ public async Task FakeOuterNumberSerialize uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/number" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/number"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/number"); if (body.IsSet) httpRequestMessageLocalVar.Content = (body.Value as object) is System.IO.Stream stream @@ -2353,7 +2353,7 @@ public async Task FakeOuterStringSerialize uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/string" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/string"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/string"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -2590,7 +2590,7 @@ public async Task GetArrayOfEnumsAsync(System.Threa uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/array-of-enums" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/array-of-enums"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/array-of-enums"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -2807,7 +2807,7 @@ public async Task GetMixedAnyOfAsync(System.Threading uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/mixed/anyOf" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/mixed/anyOf"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/mixed/anyOf"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -3024,7 +3024,7 @@ public async Task GetMixedOneOfAsync(System.Threading uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/mixed/oneOf" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/mixed/oneOf"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/mixed/oneOf"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -3264,7 +3264,7 @@ public async Task TestAdditionalP uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/additionalProperties-reference" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/additionalProperties-reference"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/additionalProperties-reference"); httpRequestMessageLocalVar.Content = (requestBody as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -3477,7 +3477,7 @@ public async Task TestBodyWithFileSchemaAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/body-with-file-schema" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/body-with-file-schema"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/body-with-file-schema"); httpRequestMessageLocalVar.Content = (fileSchemaTestClass as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -3700,7 +3700,7 @@ public async Task TestBodyWithQueryParamsAs uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/body-with-query-params" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/body-with-query-params"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/body-with-query-params"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -3919,7 +3919,7 @@ public async Task TestClientModelAsync(ModelClient uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); httpRequestMessageLocalVar.Content = (modelClient as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -4270,7 +4270,7 @@ public async Task TestEndpointParametersAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); List> formParameterLocalVars = new List>(); @@ -4584,7 +4584,7 @@ public async Task TestEnumParametersAsync(Option uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -4844,7 +4844,7 @@ public async Task TestGroupParametersAsync(bool uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -5072,7 +5072,7 @@ public async Task TestInlineAddition uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/inline-additionalProperties" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/inline-additionalProperties"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/inline-additionalProperties"); httpRequestMessageLocalVar.Content = (requestBody as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -5285,7 +5285,7 @@ public async Task TestInline uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/inline-freeform-additionalProperties" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/inline-freeform-additionalProperties"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/inline-freeform-additionalProperties"); httpRequestMessageLocalVar.Content = (testInlineFreeformAdditionalPropertiesRequest as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -5508,7 +5508,7 @@ public async Task TestJsonFormDataAsync(string par uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/jsonFormData" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/jsonFormData"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/jsonFormData"); List> formParameterLocalVars = new List>(); @@ -5793,7 +5793,7 @@ public async Task TestQueryParam uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/test-query-parameters" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/test-query-parameters"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/test-query-parameters"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -6010,7 +6010,7 @@ public async Task TestStringMapReferenceAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/stringMap-reference" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/stringMap-reference"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/stringMap-reference"); httpRequestMessageLocalVar.Content = (requestBody as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs index 842ef6eccafa..da2c72009ed0 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs @@ -273,7 +273,7 @@ public async Task TestClassnameAsync(ModelClient mode uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake_classname_test" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake_classname_test"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake_classname_test"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/PetApi.cs index 0daa375c9f6f..123697ade060 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/PetApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/PetApi.cs @@ -1073,7 +1073,7 @@ public async Task DeletePetAsync(long petId, Option FindPetsByStatusAsync(List FindPetsByTagsAsync(List t uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/pet/findByTags" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/pet/findByTags"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/pet/findByTags"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -1848,7 +1848,7 @@ public async Task GetPetByIdAsync(long petId, System.Thr uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/pet/{petId}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/pet/{petId}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/pet/{petId}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -2380,7 +2380,7 @@ public async Task UpdatePetWithFormAsync(long pet uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/pet/{petId}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/pet/{petId}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/pet/{petId}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); List> formParameterLocalVars = new List>(); @@ -2623,7 +2623,7 @@ public async Task UploadFileAsync(long petId, Option UploadFileWithRequired uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/{petId}/uploadImageWithRequiredFile" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/{petId}/uploadImageWithRequiredFile"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/{petId}/uploadImageWithRequiredFile"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); MultipartFormDataContent multipartContentLocalVar = new MultipartFormDataContent(); @@ -3195,7 +3195,7 @@ public async Task UploadFilesAsync(List DeleteOrderAsync(string orderId, Syst uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/order/{order_id}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/order/{order_id}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/order/{order_id}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Border_id%7D", Uri.EscapeDataString(orderId.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -643,7 +643,7 @@ public async Task GetInventoryAsync(System.Threading.C uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/inventory" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/inventory"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/inventory"); List tokenBaseLocalVars = new List(); ApiKeyToken apiKeyTokenLocalVar1 = (ApiKeyToken) await ApiKeyProvider.GetAsync("api-key", cancellationToken).ConfigureAwait(false); @@ -879,7 +879,7 @@ public async Task GetOrderByIdAsync(long orderId, Syst uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/order/{order_id}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/order/{order_id}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/order/{order_id}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Border_id%7D", Uri.EscapeDataString(orderId.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1133,7 +1133,7 @@ public async Task PlaceOrderAsync(Order order, System.Th uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/order" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/order"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/order"); httpRequestMessageLocalVar.Content = (order as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/UserApi.cs index 9c10dba6b8f7..22514301a2c9 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/UserApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/UserApi.cs @@ -702,7 +702,7 @@ public async Task CreateUserAsync(User user, System.Thre uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user"); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -915,7 +915,7 @@ public async Task CreateUsersWithArrayInp uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/createWithArray" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/createWithArray"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/createWithArray"); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -1128,7 +1128,7 @@ public async Task CreateUsersWithListInput uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/createWithList" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/createWithList"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/createWithList"); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -1341,7 +1341,7 @@ public async Task DeleteUserAsync(string username, Syste uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/{username}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/{username}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/{username}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1547,7 +1547,7 @@ public async Task GetUserByNameAsync(string username, uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/{username}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/{username}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/{username}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1855,7 +1855,7 @@ public async Task LoginUserAsync(string password, string uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/login" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/login"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/login"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -2086,7 +2086,7 @@ public async Task LogoutUserAsync(System.Threading.Cance uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/logout" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/logout"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/logout"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; httpRequestMessageLocalVar.Method = new HttpMethod("GET"); @@ -2295,7 +2295,7 @@ public async Task UpdateUserAsync(User user, string user uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/{username}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/{username}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/{username}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream diff --git a/samples/client/petstore/csharp/generichost/net4.7/OneOf/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net4.7/OneOf/src/Org.OpenAPITools/Api/DefaultApi.cs index b55767b337b1..24454e8f663a 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/OneOf/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/OneOf/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -213,7 +213,7 @@ public async Task RootGetAsync(System.Threading.Cancellatio uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs index 58e90074f17b..7eeebe9c25d2 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -273,7 +273,7 @@ public async Task Call123TestSpecialTagsAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/another-fake/dummy" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/another-fake/dummy"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/another-fake/dummy"); httpRequestMessageLocalVar.Content = (modelClient as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/DefaultApi.cs index 24a69b84527e..9750887d4beb 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -521,7 +521,7 @@ public async Task FooGetAsync(System.Threading.CancellationT uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/foo" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/foo"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/foo"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -761,7 +761,7 @@ public async Task GetCountryAsync(string country, System uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/country" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/country"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/country"); List> formParameterLocalVars = new List>(); @@ -949,7 +949,7 @@ public async Task HelloAsync(System.Threading.CancellationTok uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/hello" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/hello"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/hello"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1166,7 +1166,7 @@ public async Task RedirectOrDefaultAsync(System.T uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/redirectOrDefault" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/redirectOrDefault"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/redirectOrDefault"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1389,7 +1389,7 @@ public async Task RolesReportGetAsync(System.Threadi uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/roles/report" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/roles/report"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/roles/report"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1606,7 +1606,7 @@ public async Task TestAsync(System.Threading.CancellationToken uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/test" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/test"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/test"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs index a3a842305a6f..700574a85fba 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs @@ -1371,7 +1371,7 @@ public async Task FakeHealthGetAsync(System.Threading uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/health" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/health"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/health"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1598,7 +1598,7 @@ public async Task FakeOuterBooleanSeriali uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/boolean" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/boolean"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/boolean"); if (body.IsSet) httpRequestMessageLocalVar.Content = (body.Value as object) is System.IO.Stream stream @@ -1852,7 +1852,7 @@ public async Task FakeOuterCompositeSer uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/composite" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/composite"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/composite"); if (outerComposite.IsSet) httpRequestMessageLocalVar.Content = (outerComposite.Value as object) is System.IO.Stream stream @@ -2093,7 +2093,7 @@ public async Task FakeOuterNumberSerialize uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/number" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/number"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/number"); if (body.IsSet) httpRequestMessageLocalVar.Content = (body.Value as object) is System.IO.Stream stream @@ -2353,7 +2353,7 @@ public async Task FakeOuterStringSerialize uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/string" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/string"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/string"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -2590,7 +2590,7 @@ public async Task GetArrayOfEnumsAsync(System.Threa uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/array-of-enums" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/array-of-enums"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/array-of-enums"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -2807,7 +2807,7 @@ public async Task GetMixedAnyOfAsync(System.Threading uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/mixed/anyOf" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/mixed/anyOf"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/mixed/anyOf"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -3024,7 +3024,7 @@ public async Task GetMixedOneOfAsync(System.Threading uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/mixed/oneOf" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/mixed/oneOf"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/mixed/oneOf"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -3264,7 +3264,7 @@ public async Task TestAdditionalP uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/additionalProperties-reference" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/additionalProperties-reference"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/additionalProperties-reference"); httpRequestMessageLocalVar.Content = (requestBody as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -3477,7 +3477,7 @@ public async Task TestBodyWithFileSchemaAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/body-with-file-schema" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/body-with-file-schema"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/body-with-file-schema"); httpRequestMessageLocalVar.Content = (fileSchemaTestClass as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -3700,7 +3700,7 @@ public async Task TestBodyWithQueryParamsAs uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/body-with-query-params" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/body-with-query-params"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/body-with-query-params"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -3919,7 +3919,7 @@ public async Task TestClientModelAsync(ModelClient uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); httpRequestMessageLocalVar.Content = (modelClient as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -4270,7 +4270,7 @@ public async Task TestEndpointParametersAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); List> formParameterLocalVars = new List>(); @@ -4596,7 +4596,7 @@ public async Task TestEnumParametersAsync(Option uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -4856,7 +4856,7 @@ public async Task TestGroupParametersAsync(bool uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -5084,7 +5084,7 @@ public async Task TestInlineAddition uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/inline-additionalProperties" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/inline-additionalProperties"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/inline-additionalProperties"); httpRequestMessageLocalVar.Content = (requestBody as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -5297,7 +5297,7 @@ public async Task TestInline uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/inline-freeform-additionalProperties" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/inline-freeform-additionalProperties"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/inline-freeform-additionalProperties"); httpRequestMessageLocalVar.Content = (testInlineFreeformAdditionalPropertiesRequest as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -5520,7 +5520,7 @@ public async Task TestJsonFormDataAsync(string par uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/jsonFormData" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/jsonFormData"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/jsonFormData"); List> formParameterLocalVars = new List>(); @@ -5805,7 +5805,7 @@ public async Task TestQueryParam uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/test-query-parameters" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/test-query-parameters"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/test-query-parameters"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -6022,7 +6022,7 @@ public async Task TestStringMapReferenceAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/stringMap-reference" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/stringMap-reference"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/stringMap-reference"); httpRequestMessageLocalVar.Content = (requestBody as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs index 842ef6eccafa..da2c72009ed0 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs @@ -273,7 +273,7 @@ public async Task TestClassnameAsync(ModelClient mode uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake_classname_test" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake_classname_test"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake_classname_test"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/PetApi.cs index 432c4e94b1f6..bf1464ce788a 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/PetApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/PetApi.cs @@ -1073,7 +1073,7 @@ public async Task DeletePetAsync(long petId, Option FindPetsByStatusAsync(List FindPetsByTagsAsync(List t uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/pet/findByTags" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/pet/findByTags"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/pet/findByTags"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -1848,7 +1848,7 @@ public async Task GetPetByIdAsync(long petId, System.Thr uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/pet/{petId}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/pet/{petId}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/pet/{petId}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -2380,7 +2380,7 @@ public async Task UpdatePetWithFormAsync(long pet uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/pet/{petId}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/pet/{petId}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/pet/{petId}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); List> formParameterLocalVars = new List>(); @@ -2623,7 +2623,7 @@ public async Task UploadFileAsync(long petId, Option UploadFileWithRequired uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/{petId}/uploadImageWithRequiredFile" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/{petId}/uploadImageWithRequiredFile"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/{petId}/uploadImageWithRequiredFile"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); MultipartFormDataContent multipartContentLocalVar = new MultipartFormDataContent(); @@ -3195,7 +3195,7 @@ public async Task UploadFilesAsync(List DeleteOrderAsync(string orderId, Syst uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/order/{order_id}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/order/{order_id}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/order/{order_id}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Border_id%7D", Uri.EscapeDataString(orderId.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -643,7 +643,7 @@ public async Task GetInventoryAsync(System.Threading.C uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/inventory" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/inventory"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/inventory"); List tokenBaseLocalVars = new List(); ApiKeyToken apiKeyTokenLocalVar1 = (ApiKeyToken) await ApiKeyProvider.GetAsync("api-key", cancellationToken).ConfigureAwait(false); @@ -879,7 +879,7 @@ public async Task GetOrderByIdAsync(long orderId, Syst uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/order/{order_id}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/order/{order_id}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/order/{order_id}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Border_id%7D", Uri.EscapeDataString(orderId.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1133,7 +1133,7 @@ public async Task PlaceOrderAsync(Order order, System.Th uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/order" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/order"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/order"); httpRequestMessageLocalVar.Content = (order as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/UserApi.cs index 9c10dba6b8f7..22514301a2c9 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/UserApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/UserApi.cs @@ -702,7 +702,7 @@ public async Task CreateUserAsync(User user, System.Thre uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user"); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -915,7 +915,7 @@ public async Task CreateUsersWithArrayInp uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/createWithArray" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/createWithArray"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/createWithArray"); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -1128,7 +1128,7 @@ public async Task CreateUsersWithListInput uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/createWithList" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/createWithList"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/createWithList"); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -1341,7 +1341,7 @@ public async Task DeleteUserAsync(string username, Syste uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/{username}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/{username}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/{username}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1547,7 +1547,7 @@ public async Task GetUserByNameAsync(string username, uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/{username}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/{username}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/{username}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1855,7 +1855,7 @@ public async Task LoginUserAsync(string password, string uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/login" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/login"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/login"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -2086,7 +2086,7 @@ public async Task LogoutUserAsync(System.Threading.Cance uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/logout" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/logout"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/logout"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; httpRequestMessageLocalVar.Method = new HttpMethod("GET"); @@ -2295,7 +2295,7 @@ public async Task UpdateUserAsync(User user, string user uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/{username}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/{username}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/{username}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream diff --git a/samples/client/petstore/csharp/generichost/net4.7/UseDateTimeForDate/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net4.7/UseDateTimeForDate/src/Org.OpenAPITools/Api/DefaultApi.cs index a9838513a5c6..c07e3e24913e 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/UseDateTimeForDate/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/UseDateTimeForDate/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -213,7 +213,7 @@ public async Task NowGetAsync(System.Threading.CancellationT uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/now" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/now"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/now"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; diff --git a/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools/Api/DefaultApi.cs index c054b04da9ff..3745f6dafbf5 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -238,7 +238,7 @@ public async Task ListAsync(string personId, System.Threading. uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/person/display/{personId}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/person/display/{personId}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/person/display/{personId}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpersonId%7D", Uri.EscapeDataString(personId.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; diff --git a/samples/client/petstore/csharp/generichost/net4.8/AnyOf/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net4.8/AnyOf/src/Org.OpenAPITools/Api/DefaultApi.cs index b55767b337b1..24454e8f663a 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/AnyOf/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/AnyOf/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -213,7 +213,7 @@ public async Task RootGetAsync(System.Threading.Cancellatio uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; diff --git a/samples/client/petstore/csharp/generichost/net4.8/AnyOfNoCompare/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net4.8/AnyOfNoCompare/src/Org.OpenAPITools/Api/DefaultApi.cs index b55767b337b1..24454e8f663a 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/AnyOfNoCompare/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/AnyOfNoCompare/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -213,7 +213,7 @@ public async Task RootGetAsync(System.Threading.Cancellatio uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/AnotherFakeApi.cs index 58e90074f17b..7eeebe9c25d2 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/AnotherFakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -273,7 +273,7 @@ public async Task Call123TestSpecialTagsAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/another-fake/dummy" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/another-fake/dummy"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/another-fake/dummy"); httpRequestMessageLocalVar.Content = (modelClient as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/DefaultApi.cs index 24a69b84527e..9750887d4beb 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -521,7 +521,7 @@ public async Task FooGetAsync(System.Threading.CancellationT uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/foo" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/foo"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/foo"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -761,7 +761,7 @@ public async Task GetCountryAsync(string country, System uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/country" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/country"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/country"); List> formParameterLocalVars = new List>(); @@ -949,7 +949,7 @@ public async Task HelloAsync(System.Threading.CancellationTok uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/hello" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/hello"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/hello"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1166,7 +1166,7 @@ public async Task RedirectOrDefaultAsync(System.T uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/redirectOrDefault" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/redirectOrDefault"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/redirectOrDefault"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1389,7 +1389,7 @@ public async Task RolesReportGetAsync(System.Threadi uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/roles/report" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/roles/report"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/roles/report"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1606,7 +1606,7 @@ public async Task TestAsync(System.Threading.CancellationToken uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/test" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/test"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/test"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs index 9f2605d1777f..98684187061c 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs @@ -1371,7 +1371,7 @@ public async Task FakeHealthGetAsync(System.Threading uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/health" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/health"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/health"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1598,7 +1598,7 @@ public async Task FakeOuterBooleanSeriali uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/boolean" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/boolean"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/boolean"); if (body.IsSet) httpRequestMessageLocalVar.Content = (body.Value as object) is System.IO.Stream stream @@ -1852,7 +1852,7 @@ public async Task FakeOuterCompositeSer uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/composite" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/composite"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/composite"); if (outerComposite.IsSet) httpRequestMessageLocalVar.Content = (outerComposite.Value as object) is System.IO.Stream stream @@ -2093,7 +2093,7 @@ public async Task FakeOuterNumberSerialize uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/number" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/number"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/number"); if (body.IsSet) httpRequestMessageLocalVar.Content = (body.Value as object) is System.IO.Stream stream @@ -2353,7 +2353,7 @@ public async Task FakeOuterStringSerialize uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/string" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/string"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/string"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -2590,7 +2590,7 @@ public async Task GetArrayOfEnumsAsync(System.Threa uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/array-of-enums" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/array-of-enums"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/array-of-enums"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -2807,7 +2807,7 @@ public async Task GetMixedAnyOfAsync(System.Threading uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/mixed/anyOf" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/mixed/anyOf"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/mixed/anyOf"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -3024,7 +3024,7 @@ public async Task GetMixedOneOfAsync(System.Threading uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/mixed/oneOf" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/mixed/oneOf"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/mixed/oneOf"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -3264,7 +3264,7 @@ public async Task TestAdditionalP uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/additionalProperties-reference" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/additionalProperties-reference"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/additionalProperties-reference"); httpRequestMessageLocalVar.Content = (requestBody as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -3477,7 +3477,7 @@ public async Task TestBodyWithFileSchemaAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/body-with-file-schema" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/body-with-file-schema"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/body-with-file-schema"); httpRequestMessageLocalVar.Content = (fileSchemaTestClass as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -3700,7 +3700,7 @@ public async Task TestBodyWithQueryParamsAs uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/body-with-query-params" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/body-with-query-params"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/body-with-query-params"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -3919,7 +3919,7 @@ public async Task TestClientModelAsync(ModelClient uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); httpRequestMessageLocalVar.Content = (modelClient as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -4270,7 +4270,7 @@ public async Task TestEndpointParametersAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); List> formParameterLocalVars = new List>(); @@ -4584,7 +4584,7 @@ public async Task TestEnumParametersAsync(Option uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -4844,7 +4844,7 @@ public async Task TestGroupParametersAsync(bool uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -5072,7 +5072,7 @@ public async Task TestInlineAddition uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/inline-additionalProperties" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/inline-additionalProperties"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/inline-additionalProperties"); httpRequestMessageLocalVar.Content = (requestBody as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -5285,7 +5285,7 @@ public async Task TestInline uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/inline-freeform-additionalProperties" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/inline-freeform-additionalProperties"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/inline-freeform-additionalProperties"); httpRequestMessageLocalVar.Content = (testInlineFreeformAdditionalPropertiesRequest as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -5508,7 +5508,7 @@ public async Task TestJsonFormDataAsync(string par uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/jsonFormData" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/jsonFormData"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/jsonFormData"); List> formParameterLocalVars = new List>(); @@ -5793,7 +5793,7 @@ public async Task TestQueryParam uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/test-query-parameters" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/test-query-parameters"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/test-query-parameters"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -6010,7 +6010,7 @@ public async Task TestStringMapReferenceAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/stringMap-reference" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/stringMap-reference"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/stringMap-reference"); httpRequestMessageLocalVar.Content = (requestBody as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs index 842ef6eccafa..da2c72009ed0 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs @@ -273,7 +273,7 @@ public async Task TestClassnameAsync(ModelClient mode uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake_classname_test" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake_classname_test"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake_classname_test"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/PetApi.cs index 0daa375c9f6f..123697ade060 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/PetApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/PetApi.cs @@ -1073,7 +1073,7 @@ public async Task DeletePetAsync(long petId, Option FindPetsByStatusAsync(List FindPetsByTagsAsync(List t uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/pet/findByTags" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/pet/findByTags"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/pet/findByTags"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -1848,7 +1848,7 @@ public async Task GetPetByIdAsync(long petId, System.Thr uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/pet/{petId}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/pet/{petId}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/pet/{petId}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -2380,7 +2380,7 @@ public async Task UpdatePetWithFormAsync(long pet uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/pet/{petId}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/pet/{petId}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/pet/{petId}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); List> formParameterLocalVars = new List>(); @@ -2623,7 +2623,7 @@ public async Task UploadFileAsync(long petId, Option UploadFileWithRequired uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/{petId}/uploadImageWithRequiredFile" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/{petId}/uploadImageWithRequiredFile"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/{petId}/uploadImageWithRequiredFile"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); MultipartFormDataContent multipartContentLocalVar = new MultipartFormDataContent(); @@ -3195,7 +3195,7 @@ public async Task UploadFilesAsync(List DeleteOrderAsync(string orderId, Syst uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/order/{order_id}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/order/{order_id}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/order/{order_id}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Border_id%7D", Uri.EscapeDataString(orderId.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -643,7 +643,7 @@ public async Task GetInventoryAsync(System.Threading.C uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/inventory" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/inventory"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/inventory"); List tokenBaseLocalVars = new List(); ApiKeyToken apiKeyTokenLocalVar1 = (ApiKeyToken) await ApiKeyProvider.GetAsync("api-key", cancellationToken).ConfigureAwait(false); @@ -879,7 +879,7 @@ public async Task GetOrderByIdAsync(long orderId, Syst uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/order/{order_id}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/order/{order_id}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/order/{order_id}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Border_id%7D", Uri.EscapeDataString(orderId.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1133,7 +1133,7 @@ public async Task PlaceOrderAsync(Order order, System.Th uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/order" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/order"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/order"); httpRequestMessageLocalVar.Content = (order as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/UserApi.cs index 9c10dba6b8f7..22514301a2c9 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/UserApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/UserApi.cs @@ -702,7 +702,7 @@ public async Task CreateUserAsync(User user, System.Thre uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user"); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -915,7 +915,7 @@ public async Task CreateUsersWithArrayInp uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/createWithArray" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/createWithArray"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/createWithArray"); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -1128,7 +1128,7 @@ public async Task CreateUsersWithListInput uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/createWithList" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/createWithList"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/createWithList"); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -1341,7 +1341,7 @@ public async Task DeleteUserAsync(string username, Syste uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/{username}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/{username}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/{username}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1547,7 +1547,7 @@ public async Task GetUserByNameAsync(string username, uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/{username}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/{username}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/{username}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1855,7 +1855,7 @@ public async Task LoginUserAsync(string password, string uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/login" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/login"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/login"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -2086,7 +2086,7 @@ public async Task LogoutUserAsync(System.Threading.Cance uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/logout" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/logout"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/logout"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; httpRequestMessageLocalVar.Method = new HttpMethod("GET"); @@ -2295,7 +2295,7 @@ public async Task UpdateUserAsync(User user, string user uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/{username}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/{username}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/{username}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream diff --git a/samples/client/petstore/csharp/generichost/net4.8/OneOf/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net4.8/OneOf/src/Org.OpenAPITools/Api/DefaultApi.cs index b55767b337b1..24454e8f663a 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/OneOf/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/OneOf/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -213,7 +213,7 @@ public async Task RootGetAsync(System.Threading.Cancellatio uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs index 58e90074f17b..7eeebe9c25d2 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -273,7 +273,7 @@ public async Task Call123TestSpecialTagsAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/another-fake/dummy" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/another-fake/dummy"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/another-fake/dummy"); httpRequestMessageLocalVar.Content = (modelClient as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/DefaultApi.cs index 24a69b84527e..9750887d4beb 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -521,7 +521,7 @@ public async Task FooGetAsync(System.Threading.CancellationT uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/foo" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/foo"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/foo"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -761,7 +761,7 @@ public async Task GetCountryAsync(string country, System uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/country" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/country"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/country"); List> formParameterLocalVars = new List>(); @@ -949,7 +949,7 @@ public async Task HelloAsync(System.Threading.CancellationTok uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/hello" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/hello"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/hello"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1166,7 +1166,7 @@ public async Task RedirectOrDefaultAsync(System.T uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/redirectOrDefault" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/redirectOrDefault"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/redirectOrDefault"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1389,7 +1389,7 @@ public async Task RolesReportGetAsync(System.Threadi uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/roles/report" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/roles/report"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/roles/report"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1606,7 +1606,7 @@ public async Task TestAsync(System.Threading.CancellationToken uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/test" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/test"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/test"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs index a3a842305a6f..700574a85fba 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs @@ -1371,7 +1371,7 @@ public async Task FakeHealthGetAsync(System.Threading uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/health" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/health"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/health"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1598,7 +1598,7 @@ public async Task FakeOuterBooleanSeriali uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/boolean" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/boolean"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/boolean"); if (body.IsSet) httpRequestMessageLocalVar.Content = (body.Value as object) is System.IO.Stream stream @@ -1852,7 +1852,7 @@ public async Task FakeOuterCompositeSer uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/composite" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/composite"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/composite"); if (outerComposite.IsSet) httpRequestMessageLocalVar.Content = (outerComposite.Value as object) is System.IO.Stream stream @@ -2093,7 +2093,7 @@ public async Task FakeOuterNumberSerialize uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/number" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/number"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/number"); if (body.IsSet) httpRequestMessageLocalVar.Content = (body.Value as object) is System.IO.Stream stream @@ -2353,7 +2353,7 @@ public async Task FakeOuterStringSerialize uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/string" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/string"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/string"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -2590,7 +2590,7 @@ public async Task GetArrayOfEnumsAsync(System.Threa uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/array-of-enums" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/array-of-enums"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/array-of-enums"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -2807,7 +2807,7 @@ public async Task GetMixedAnyOfAsync(System.Threading uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/mixed/anyOf" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/mixed/anyOf"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/mixed/anyOf"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -3024,7 +3024,7 @@ public async Task GetMixedOneOfAsync(System.Threading uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/mixed/oneOf" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/mixed/oneOf"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/mixed/oneOf"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -3264,7 +3264,7 @@ public async Task TestAdditionalP uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/additionalProperties-reference" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/additionalProperties-reference"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/additionalProperties-reference"); httpRequestMessageLocalVar.Content = (requestBody as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -3477,7 +3477,7 @@ public async Task TestBodyWithFileSchemaAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/body-with-file-schema" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/body-with-file-schema"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/body-with-file-schema"); httpRequestMessageLocalVar.Content = (fileSchemaTestClass as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -3700,7 +3700,7 @@ public async Task TestBodyWithQueryParamsAs uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/body-with-query-params" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/body-with-query-params"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/body-with-query-params"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -3919,7 +3919,7 @@ public async Task TestClientModelAsync(ModelClient uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); httpRequestMessageLocalVar.Content = (modelClient as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -4270,7 +4270,7 @@ public async Task TestEndpointParametersAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); List> formParameterLocalVars = new List>(); @@ -4596,7 +4596,7 @@ public async Task TestEnumParametersAsync(Option uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -4856,7 +4856,7 @@ public async Task TestGroupParametersAsync(bool uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -5084,7 +5084,7 @@ public async Task TestInlineAddition uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/inline-additionalProperties" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/inline-additionalProperties"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/inline-additionalProperties"); httpRequestMessageLocalVar.Content = (requestBody as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -5297,7 +5297,7 @@ public async Task TestInline uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/inline-freeform-additionalProperties" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/inline-freeform-additionalProperties"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/inline-freeform-additionalProperties"); httpRequestMessageLocalVar.Content = (testInlineFreeformAdditionalPropertiesRequest as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -5520,7 +5520,7 @@ public async Task TestJsonFormDataAsync(string par uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/jsonFormData" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/jsonFormData"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/jsonFormData"); List> formParameterLocalVars = new List>(); @@ -5805,7 +5805,7 @@ public async Task TestQueryParam uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/test-query-parameters" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/test-query-parameters"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/test-query-parameters"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -6022,7 +6022,7 @@ public async Task TestStringMapReferenceAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/stringMap-reference" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/stringMap-reference"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/stringMap-reference"); httpRequestMessageLocalVar.Content = (requestBody as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs index 842ef6eccafa..da2c72009ed0 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs @@ -273,7 +273,7 @@ public async Task TestClassnameAsync(ModelClient mode uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake_classname_test" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake_classname_test"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake_classname_test"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/PetApi.cs index 432c4e94b1f6..bf1464ce788a 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/PetApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/PetApi.cs @@ -1073,7 +1073,7 @@ public async Task DeletePetAsync(long petId, Option FindPetsByStatusAsync(List FindPetsByTagsAsync(List t uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/pet/findByTags" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/pet/findByTags"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/pet/findByTags"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -1848,7 +1848,7 @@ public async Task GetPetByIdAsync(long petId, System.Thr uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/pet/{petId}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/pet/{petId}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/pet/{petId}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -2380,7 +2380,7 @@ public async Task UpdatePetWithFormAsync(long pet uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/pet/{petId}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/pet/{petId}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/pet/{petId}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); List> formParameterLocalVars = new List>(); @@ -2623,7 +2623,7 @@ public async Task UploadFileAsync(long petId, Option UploadFileWithRequired uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/{petId}/uploadImageWithRequiredFile" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/{petId}/uploadImageWithRequiredFile"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/{petId}/uploadImageWithRequiredFile"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); MultipartFormDataContent multipartContentLocalVar = new MultipartFormDataContent(); @@ -3195,7 +3195,7 @@ public async Task UploadFilesAsync(List DeleteOrderAsync(string orderId, Syst uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/order/{order_id}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/order/{order_id}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/order/{order_id}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Border_id%7D", Uri.EscapeDataString(orderId.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -643,7 +643,7 @@ public async Task GetInventoryAsync(System.Threading.C uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/inventory" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/inventory"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/inventory"); List tokenBaseLocalVars = new List(); ApiKeyToken apiKeyTokenLocalVar1 = (ApiKeyToken) await ApiKeyProvider.GetAsync("api-key", cancellationToken).ConfigureAwait(false); @@ -879,7 +879,7 @@ public async Task GetOrderByIdAsync(long orderId, Syst uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/order/{order_id}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/order/{order_id}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/order/{order_id}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Border_id%7D", Uri.EscapeDataString(orderId.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1133,7 +1133,7 @@ public async Task PlaceOrderAsync(Order order, System.Th uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/order" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/order"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/order"); httpRequestMessageLocalVar.Content = (order as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/UserApi.cs index 9c10dba6b8f7..22514301a2c9 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/UserApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/UserApi.cs @@ -702,7 +702,7 @@ public async Task CreateUserAsync(User user, System.Thre uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user"); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -915,7 +915,7 @@ public async Task CreateUsersWithArrayInp uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/createWithArray" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/createWithArray"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/createWithArray"); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -1128,7 +1128,7 @@ public async Task CreateUsersWithListInput uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/createWithList" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/createWithList"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/createWithList"); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -1341,7 +1341,7 @@ public async Task DeleteUserAsync(string username, Syste uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/{username}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/{username}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/{username}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1547,7 +1547,7 @@ public async Task GetUserByNameAsync(string username, uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/{username}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/{username}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/{username}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1855,7 +1855,7 @@ public async Task LoginUserAsync(string password, string uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/login" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/login"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/login"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -2086,7 +2086,7 @@ public async Task LogoutUserAsync(System.Threading.Cance uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/logout" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/logout"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/logout"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; httpRequestMessageLocalVar.Method = new HttpMethod("GET"); @@ -2295,7 +2295,7 @@ public async Task UpdateUserAsync(User user, string user uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/{username}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/{username}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/{username}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream diff --git a/samples/client/petstore/csharp/generichost/net4.8/UseDateTimeForDate/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net4.8/UseDateTimeForDate/src/Org.OpenAPITools/Api/DefaultApi.cs index a9838513a5c6..c07e3e24913e 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/UseDateTimeForDate/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/UseDateTimeForDate/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -213,7 +213,7 @@ public async Task NowGetAsync(System.Threading.CancellationT uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/now" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/now"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/now"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; diff --git a/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Api/DefaultApi.cs index 7742edaa18e9..6e510044ff6f 100644 --- a/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -240,7 +240,7 @@ public async Task ListAsync(string personId, System.Threading. uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/person/display/{personId}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/person/display/{personId}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/person/display/{personId}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpersonId%7D", Uri.EscapeDataString(personId.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; diff --git a/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Api/DefaultApi.cs index 76cd3ec1f26e..951a8589ef49 100644 --- a/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -215,7 +215,7 @@ public async Task RootGetAsync(System.Threading.Cancellatio uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; diff --git a/samples/client/petstore/csharp/generichost/net8/AnyOfNoCompare/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net8/AnyOfNoCompare/src/Org.OpenAPITools/Api/DefaultApi.cs index 76cd3ec1f26e..951a8589ef49 100644 --- a/samples/client/petstore/csharp/generichost/net8/AnyOfNoCompare/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net8/AnyOfNoCompare/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -215,7 +215,7 @@ public async Task RootGetAsync(System.Threading.Cancellatio uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/AnotherFakeApi.cs index c05e11b53887..374598ad581f 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/AnotherFakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -273,7 +273,7 @@ public async Task Call123TestSpecialTagsAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/another-fake/dummy" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/another-fake/dummy"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/another-fake/dummy"); httpRequestMessageLocalVar.Content = (modelClient as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/DefaultApi.cs index 44d52e7e1090..5b43ed103210 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -521,7 +521,7 @@ public async Task FooGetAsync(System.Threading.CancellationT uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/foo" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/foo"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/foo"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -762,7 +762,7 @@ public async Task GetCountryAsync(string country, System uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/country" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/country"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/country"); List> formParameterLocalVars = new List>(); @@ -950,7 +950,7 @@ public async Task HelloAsync(System.Threading.CancellationTok uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/hello" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/hello"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/hello"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1168,7 +1168,7 @@ public async Task RedirectOrDefaultAsync(System.T uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/redirectOrDefault" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/redirectOrDefault"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/redirectOrDefault"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1392,7 +1392,7 @@ public async Task RolesReportGetAsync(System.Threadi uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/roles/report" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/roles/report"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/roles/report"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1610,7 +1610,7 @@ public async Task TestAsync(System.Threading.CancellationToken uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/test" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/test"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/test"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs index 0070617289e6..8a489ed1f3f3 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs @@ -1371,7 +1371,7 @@ public async Task FakeHealthGetAsync(System.Threading uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/health" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/health"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/health"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1599,7 +1599,7 @@ public async Task FakeOuterBooleanSeriali uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/boolean" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/boolean"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/boolean"); if (body.IsSet) httpRequestMessageLocalVar.Content = (body.Value as object) is System.IO.Stream stream @@ -1854,7 +1854,7 @@ public async Task FakeOuterCompositeSer uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/composite" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/composite"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/composite"); if (outerComposite.IsSet) httpRequestMessageLocalVar.Content = (outerComposite.Value as object) is System.IO.Stream stream @@ -2096,7 +2096,7 @@ public async Task FakeOuterNumberSerialize uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/number" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/number"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/number"); if (body.IsSet) httpRequestMessageLocalVar.Content = (body.Value as object) is System.IO.Stream stream @@ -2357,7 +2357,7 @@ public async Task FakeOuterStringSerialize uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/string" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/string"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/string"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -2595,7 +2595,7 @@ public async Task GetArrayOfEnumsAsync(System.Threa uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/array-of-enums" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/array-of-enums"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/array-of-enums"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -2813,7 +2813,7 @@ public async Task GetMixedAnyOfAsync(System.Threading uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/mixed/anyOf" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/mixed/anyOf"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/mixed/anyOf"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -3031,7 +3031,7 @@ public async Task GetMixedOneOfAsync(System.Threading uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/mixed/oneOf" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/mixed/oneOf"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/mixed/oneOf"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -3272,7 +3272,7 @@ public async Task TestAdditionalP uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/additionalProperties-reference" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/additionalProperties-reference"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/additionalProperties-reference"); httpRequestMessageLocalVar.Content = (requestBody as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -3485,7 +3485,7 @@ public async Task TestBodyWithFileSchemaAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/body-with-file-schema" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/body-with-file-schema"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/body-with-file-schema"); httpRequestMessageLocalVar.Content = (fileSchemaTestClass as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -3708,7 +3708,7 @@ public async Task TestBodyWithQueryParamsAs uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/body-with-query-params" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/body-with-query-params"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/body-with-query-params"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -3927,7 +3927,7 @@ public async Task TestClientModelAsync(ModelClient uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); httpRequestMessageLocalVar.Content = (modelClient as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -4279,7 +4279,7 @@ public async Task TestEndpointParametersAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); List> formParameterLocalVars = new List>(); @@ -4593,7 +4593,7 @@ public async Task TestEnumParametersAsync(Option uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -4853,7 +4853,7 @@ public async Task TestGroupParametersAsync(bool uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -5082,7 +5082,7 @@ public async Task TestInlineAddition uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/inline-additionalProperties" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/inline-additionalProperties"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/inline-additionalProperties"); httpRequestMessageLocalVar.Content = (requestBody as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -5295,7 +5295,7 @@ public async Task TestInline uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/inline-freeform-additionalProperties" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/inline-freeform-additionalProperties"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/inline-freeform-additionalProperties"); httpRequestMessageLocalVar.Content = (testInlineFreeformAdditionalPropertiesRequest as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -5518,7 +5518,7 @@ public async Task TestJsonFormDataAsync(string par uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/jsonFormData" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/jsonFormData"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/jsonFormData"); List> formParameterLocalVars = new List>(); @@ -5803,7 +5803,7 @@ public async Task TestQueryParam uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/test-query-parameters" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/test-query-parameters"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/test-query-parameters"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -6021,7 +6021,7 @@ public async Task TestStringMapReferenceAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/stringMap-reference" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/stringMap-reference"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/stringMap-reference"); httpRequestMessageLocalVar.Content = (requestBody as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs index b806d5e1d0e5..802d1fdb2ac1 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs @@ -273,7 +273,7 @@ public async Task TestClassnameAsync(ModelClient mode uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake_classname_test" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake_classname_test"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake_classname_test"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/PetApi.cs index aa542fd9c05b..b49539f512bb 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/PetApi.cs +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/PetApi.cs @@ -1073,7 +1073,7 @@ public async Task DeletePetAsync(long petId, Option FindPetsByStatusAsync(List FindPetsByTagsAsync(List t uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/pet/findByTags" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/pet/findByTags"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/pet/findByTags"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -1851,7 +1851,7 @@ public async Task GetPetByIdAsync(long petId, System.Thr uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/pet/{petId}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/pet/{petId}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/pet/{petId}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -2384,7 +2384,7 @@ public async Task UpdatePetWithFormAsync(long pet uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/pet/{petId}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/pet/{petId}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/pet/{petId}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); List> formParameterLocalVars = new List>(); @@ -2627,7 +2627,7 @@ public async Task UploadFileAsync(long petId, Option UploadFileWithRequired uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/{petId}/uploadImageWithRequiredFile" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/{petId}/uploadImageWithRequiredFile"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/{petId}/uploadImageWithRequiredFile"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); MultipartFormDataContent multipartContentLocalVar = new MultipartFormDataContent(); @@ -3201,7 +3201,7 @@ public async Task UploadFilesAsync(List DeleteOrderAsync(string orderId, Syst uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/order/{order_id}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/order/{order_id}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/order/{order_id}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Border_id%7D", Uri.EscapeDataString(orderId.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -644,7 +644,7 @@ public async Task GetInventoryAsync(System.Threading.C uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/inventory" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/inventory"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/inventory"); List tokenBaseLocalVars = new List(); ApiKeyToken apiKeyTokenLocalVar1 = (ApiKeyToken) await ApiKeyProvider.GetAsync("api-key", cancellationToken).ConfigureAwait(false); @@ -881,7 +881,7 @@ public async Task GetOrderByIdAsync(long orderId, Syst uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/order/{order_id}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/order/{order_id}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/order/{order_id}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Border_id%7D", Uri.EscapeDataString(orderId.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1136,7 +1136,7 @@ public async Task PlaceOrderAsync(Order order, System.Th uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/order" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/order"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/order"); httpRequestMessageLocalVar.Content = (order as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/UserApi.cs index e92a66b21b73..c6802990ffc6 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/UserApi.cs +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/UserApi.cs @@ -710,7 +710,7 @@ public async Task CreateUserAsync(User user, System.Thre uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user"); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -923,7 +923,7 @@ public async Task CreateUsersWithArrayInp uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/createWithArray" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/createWithArray"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/createWithArray"); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -1136,7 +1136,7 @@ public async Task CreateUsersWithListInput uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/createWithList" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/createWithList"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/createWithList"); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -1349,7 +1349,7 @@ public async Task DeleteUserAsync(string username, Syste uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/{username}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/{username}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/{username}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1556,7 +1556,7 @@ public async Task GetUserByNameAsync(string username, uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/{username}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/{username}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/{username}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1865,7 +1865,7 @@ public async Task LoginUserAsync(string password, string uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/login" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/login"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/login"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -2124,7 +2124,7 @@ public async Task LogoutUserAsync(System.Threading.Cance uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/logout" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/logout"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/logout"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -2334,7 +2334,7 @@ public async Task UpdateUserAsync(User user, string user uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/{username}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/{username}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/{username}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/AnotherFakeApi.cs index 1e622f50ec73..e108a9106564 100644 --- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/AnotherFakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -275,7 +275,7 @@ public async Task Call123TestSpecialTagsAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/another-fake/dummy" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/another-fake/dummy"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/another-fake/dummy"); httpRequestMessageLocalVar.Content = (modelClient as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/DefaultApi.cs index 46b798fe32ca..23e4f720a4b2 100644 --- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -523,7 +523,7 @@ public async Task FooGetAsync(System.Threading.CancellationT uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/foo" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/foo"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/foo"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -764,7 +764,7 @@ public async Task GetCountryAsync(string country, System uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/country" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/country"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/country"); List> formParameterLocalVars = new List>(); @@ -952,7 +952,7 @@ public async Task HelloAsync(System.Threading.CancellationTok uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/hello" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/hello"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/hello"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1170,7 +1170,7 @@ public async Task RedirectOrDefaultAsync(System.T uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/redirectOrDefault" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/redirectOrDefault"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/redirectOrDefault"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1394,7 +1394,7 @@ public async Task RolesReportGetAsync(System.Threadi uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/roles/report" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/roles/report"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/roles/report"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1612,7 +1612,7 @@ public async Task TestAsync(System.Threading.CancellationToken uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/test" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/test"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/test"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/FakeApi.cs index 54a1c8c85360..7504f8b34bca 100644 --- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/FakeApi.cs @@ -1373,7 +1373,7 @@ public async Task FakeHealthGetAsync(System.Threading uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/health" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/health"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/health"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1601,7 +1601,7 @@ public async Task FakeOuterBooleanSeriali uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/boolean" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/boolean"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/boolean"); if (body.IsSet) httpRequestMessageLocalVar.Content = (body.Value as object) is System.IO.Stream stream @@ -1856,7 +1856,7 @@ public async Task FakeOuterCompositeSer uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/composite" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/composite"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/composite"); if (outerComposite.IsSet) httpRequestMessageLocalVar.Content = (outerComposite.Value as object) is System.IO.Stream stream @@ -2098,7 +2098,7 @@ public async Task FakeOuterNumberSerialize uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/number" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/number"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/number"); if (body.IsSet) httpRequestMessageLocalVar.Content = (body.Value as object) is System.IO.Stream stream @@ -2359,7 +2359,7 @@ public async Task FakeOuterStringSerialize uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/string" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/string"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/string"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -2597,7 +2597,7 @@ public async Task GetArrayOfEnumsAsync(System.Threa uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/array-of-enums" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/array-of-enums"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/array-of-enums"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -2815,7 +2815,7 @@ public async Task GetMixedAnyOfAsync(System.Threading uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/mixed/anyOf" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/mixed/anyOf"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/mixed/anyOf"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -3033,7 +3033,7 @@ public async Task GetMixedOneOfAsync(System.Threading uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/mixed/oneOf" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/mixed/oneOf"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/mixed/oneOf"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -3274,7 +3274,7 @@ public async Task TestAdditionalP uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/additionalProperties-reference" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/additionalProperties-reference"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/additionalProperties-reference"); httpRequestMessageLocalVar.Content = (requestBody as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -3487,7 +3487,7 @@ public async Task TestBodyWithFileSchemaAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/body-with-file-schema" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/body-with-file-schema"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/body-with-file-schema"); httpRequestMessageLocalVar.Content = (fileSchemaTestClass as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -3710,7 +3710,7 @@ public async Task TestBodyWithQueryParamsAs uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/body-with-query-params" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/body-with-query-params"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/body-with-query-params"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -3929,7 +3929,7 @@ public async Task TestClientModelAsync(ModelClient uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); httpRequestMessageLocalVar.Content = (modelClient as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -4281,7 +4281,7 @@ public async Task TestEndpointParametersAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); List> formParameterLocalVars = new List>(); @@ -4607,7 +4607,7 @@ public async Task TestEnumParametersAsync(Option uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -4867,7 +4867,7 @@ public async Task TestGroupParametersAsync(bool uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -5096,7 +5096,7 @@ public async Task TestInlineAddition uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/inline-additionalProperties" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/inline-additionalProperties"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/inline-additionalProperties"); httpRequestMessageLocalVar.Content = (requestBody as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -5309,7 +5309,7 @@ public async Task TestInline uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/inline-freeform-additionalProperties" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/inline-freeform-additionalProperties"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/inline-freeform-additionalProperties"); httpRequestMessageLocalVar.Content = (testInlineFreeformAdditionalPropertiesRequest as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -5532,7 +5532,7 @@ public async Task TestJsonFormDataAsync(string par uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/jsonFormData" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/jsonFormData"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/jsonFormData"); List> formParameterLocalVars = new List>(); @@ -5817,7 +5817,7 @@ public async Task TestQueryParam uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/test-query-parameters" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/test-query-parameters"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/test-query-parameters"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -6035,7 +6035,7 @@ public async Task TestStringMapReferenceAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/stringMap-reference" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/stringMap-reference"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/stringMap-reference"); httpRequestMessageLocalVar.Content = (requestBody as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs index 7e92a4878f40..f3ac29a27b3f 100644 --- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs +++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs @@ -275,7 +275,7 @@ public async Task TestClassnameAsync(ModelClient mode uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake_classname_test" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake_classname_test"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake_classname_test"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/PetApi.cs index 01f96fd91373..018360748fba 100644 --- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/PetApi.cs +++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/PetApi.cs @@ -1075,7 +1075,7 @@ public async Task DeletePetAsync(long petId, Option FindPetsByStatusAsync(List FindPetsByTagsAsync(List t uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/pet/findByTags" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/pet/findByTags"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/pet/findByTags"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -1853,7 +1853,7 @@ public async Task GetPetByIdAsync(long petId, System.Thr uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/pet/{petId}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/pet/{petId}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/pet/{petId}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -2386,7 +2386,7 @@ public async Task UpdatePetWithFormAsync(long pet uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/pet/{petId}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/pet/{petId}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/pet/{petId}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); List> formParameterLocalVars = new List>(); @@ -2629,7 +2629,7 @@ public async Task UploadFileAsync(long petId, Option UploadFileWithRequired uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/{petId}/uploadImageWithRequiredFile" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/{petId}/uploadImageWithRequiredFile"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/{petId}/uploadImageWithRequiredFile"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); MultipartFormDataContent multipartContentLocalVar = new MultipartFormDataContent(); @@ -3203,7 +3203,7 @@ public async Task UploadFilesAsync(List DeleteOrderAsync(string orderId, Syst uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/order/{order_id}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/order/{order_id}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/order/{order_id}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Border_id%7D", Uri.EscapeDataString(orderId.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -646,7 +646,7 @@ public async Task GetInventoryAsync(System.Threading.C uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/inventory" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/inventory"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/inventory"); List tokenBaseLocalVars = new List(); ApiKeyToken apiKeyTokenLocalVar1 = (ApiKeyToken) await ApiKeyProvider.GetAsync("api-key", cancellationToken).ConfigureAwait(false); @@ -883,7 +883,7 @@ public async Task GetOrderByIdAsync(long orderId, Syst uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/order/{order_id}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/order/{order_id}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/order/{order_id}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Border_id%7D", Uri.EscapeDataString(orderId.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1138,7 +1138,7 @@ public async Task PlaceOrderAsync(Order order, System.Th uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/order" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/order"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/order"); httpRequestMessageLocalVar.Content = (order as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/UserApi.cs index bddf0a80fe51..da4e3661c441 100644 --- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/UserApi.cs +++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/UserApi.cs @@ -712,7 +712,7 @@ public async Task CreateUserAsync(User user, System.Thre uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user"); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -925,7 +925,7 @@ public async Task CreateUsersWithArrayInp uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/createWithArray" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/createWithArray"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/createWithArray"); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -1138,7 +1138,7 @@ public async Task CreateUsersWithListInput uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/createWithList" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/createWithList"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/createWithList"); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -1351,7 +1351,7 @@ public async Task DeleteUserAsync(string username, Syste uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/{username}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/{username}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/{username}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1558,7 +1558,7 @@ public async Task GetUserByNameAsync(string username, uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/{username}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/{username}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/{username}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1867,7 +1867,7 @@ public async Task LoginUserAsync(string password, string uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/login" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/login"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/login"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -2126,7 +2126,7 @@ public async Task LogoutUserAsync(System.Threading.Cance uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/logout" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/logout"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/logout"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -2336,7 +2336,7 @@ public async Task UpdateUserAsync(User user, string user uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/{username}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/{username}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/{username}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream diff --git a/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Api/DefaultApi.cs index 76cd3ec1f26e..951a8589ef49 100644 --- a/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -215,7 +215,7 @@ public async Task RootGetAsync(System.Threading.Cancellatio uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs index c05e11b53887..374598ad581f 100644 --- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -273,7 +273,7 @@ public async Task Call123TestSpecialTagsAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/another-fake/dummy" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/another-fake/dummy"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/another-fake/dummy"); httpRequestMessageLocalVar.Content = (modelClient as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/DefaultApi.cs index 44d52e7e1090..5b43ed103210 100644 --- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -521,7 +521,7 @@ public async Task FooGetAsync(System.Threading.CancellationT uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/foo" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/foo"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/foo"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -762,7 +762,7 @@ public async Task GetCountryAsync(string country, System uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/country" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/country"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/country"); List> formParameterLocalVars = new List>(); @@ -950,7 +950,7 @@ public async Task HelloAsync(System.Threading.CancellationTok uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/hello" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/hello"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/hello"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1168,7 +1168,7 @@ public async Task RedirectOrDefaultAsync(System.T uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/redirectOrDefault" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/redirectOrDefault"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/redirectOrDefault"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1392,7 +1392,7 @@ public async Task RolesReportGetAsync(System.Threadi uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/roles/report" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/roles/report"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/roles/report"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1610,7 +1610,7 @@ public async Task TestAsync(System.Threading.CancellationToken uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/test" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/test"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/test"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs index 482421f8c4ea..271fbfea2636 100644 --- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs @@ -1371,7 +1371,7 @@ public async Task FakeHealthGetAsync(System.Threading uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/health" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/health"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/health"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1599,7 +1599,7 @@ public async Task FakeOuterBooleanSeriali uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/boolean" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/boolean"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/boolean"); if (body.IsSet) httpRequestMessageLocalVar.Content = (body.Value as object) is System.IO.Stream stream @@ -1854,7 +1854,7 @@ public async Task FakeOuterCompositeSer uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/composite" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/composite"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/composite"); if (outerComposite.IsSet) httpRequestMessageLocalVar.Content = (outerComposite.Value as object) is System.IO.Stream stream @@ -2096,7 +2096,7 @@ public async Task FakeOuterNumberSerialize uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/number" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/number"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/number"); if (body.IsSet) httpRequestMessageLocalVar.Content = (body.Value as object) is System.IO.Stream stream @@ -2357,7 +2357,7 @@ public async Task FakeOuterStringSerialize uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/string" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/string"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/string"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -2595,7 +2595,7 @@ public async Task GetArrayOfEnumsAsync(System.Threa uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/array-of-enums" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/array-of-enums"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/array-of-enums"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -2813,7 +2813,7 @@ public async Task GetMixedAnyOfAsync(System.Threading uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/mixed/anyOf" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/mixed/anyOf"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/mixed/anyOf"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -3031,7 +3031,7 @@ public async Task GetMixedOneOfAsync(System.Threading uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/mixed/oneOf" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/mixed/oneOf"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/mixed/oneOf"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -3272,7 +3272,7 @@ public async Task TestAdditionalP uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/additionalProperties-reference" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/additionalProperties-reference"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/additionalProperties-reference"); httpRequestMessageLocalVar.Content = (requestBody as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -3485,7 +3485,7 @@ public async Task TestBodyWithFileSchemaAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/body-with-file-schema" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/body-with-file-schema"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/body-with-file-schema"); httpRequestMessageLocalVar.Content = (fileSchemaTestClass as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -3708,7 +3708,7 @@ public async Task TestBodyWithQueryParamsAs uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/body-with-query-params" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/body-with-query-params"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/body-with-query-params"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -3927,7 +3927,7 @@ public async Task TestClientModelAsync(ModelClient uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); httpRequestMessageLocalVar.Content = (modelClient as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -4279,7 +4279,7 @@ public async Task TestEndpointParametersAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); List> formParameterLocalVars = new List>(); @@ -4605,7 +4605,7 @@ public async Task TestEnumParametersAsync(Option uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -4865,7 +4865,7 @@ public async Task TestGroupParametersAsync(bool uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -5094,7 +5094,7 @@ public async Task TestInlineAddition uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/inline-additionalProperties" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/inline-additionalProperties"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/inline-additionalProperties"); httpRequestMessageLocalVar.Content = (requestBody as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -5307,7 +5307,7 @@ public async Task TestInline uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/inline-freeform-additionalProperties" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/inline-freeform-additionalProperties"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/inline-freeform-additionalProperties"); httpRequestMessageLocalVar.Content = (testInlineFreeformAdditionalPropertiesRequest as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -5530,7 +5530,7 @@ public async Task TestJsonFormDataAsync(string par uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/jsonFormData" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/jsonFormData"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/jsonFormData"); List> formParameterLocalVars = new List>(); @@ -5815,7 +5815,7 @@ public async Task TestQueryParam uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/test-query-parameters" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/test-query-parameters"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/test-query-parameters"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -6033,7 +6033,7 @@ public async Task TestStringMapReferenceAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/stringMap-reference" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/stringMap-reference"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/stringMap-reference"); httpRequestMessageLocalVar.Content = (requestBody as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs index b806d5e1d0e5..802d1fdb2ac1 100644 --- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs +++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs @@ -273,7 +273,7 @@ public async Task TestClassnameAsync(ModelClient mode uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake_classname_test" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake_classname_test"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake_classname_test"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/PetApi.cs index 20f9ce2ce945..4e99649609ef 100644 --- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/PetApi.cs +++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/PetApi.cs @@ -1073,7 +1073,7 @@ public async Task DeletePetAsync(long petId, Option FindPetsByStatusAsync(List FindPetsByTagsAsync(List t uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/pet/findByTags" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/pet/findByTags"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/pet/findByTags"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -1851,7 +1851,7 @@ public async Task GetPetByIdAsync(long petId, System.Thr uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/pet/{petId}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/pet/{petId}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/pet/{petId}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -2384,7 +2384,7 @@ public async Task UpdatePetWithFormAsync(long pet uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/pet/{petId}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/pet/{petId}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/pet/{petId}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); List> formParameterLocalVars = new List>(); @@ -2627,7 +2627,7 @@ public async Task UploadFileAsync(long petId, Option UploadFileWithRequired uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/{petId}/uploadImageWithRequiredFile" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/{petId}/uploadImageWithRequiredFile"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/{petId}/uploadImageWithRequiredFile"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); MultipartFormDataContent multipartContentLocalVar = new MultipartFormDataContent(); @@ -3201,7 +3201,7 @@ public async Task UploadFilesAsync(List DeleteOrderAsync(string orderId, Syst uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/order/{order_id}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/order/{order_id}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/order/{order_id}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Border_id%7D", Uri.EscapeDataString(orderId.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -644,7 +644,7 @@ public async Task GetInventoryAsync(System.Threading.C uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/inventory" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/inventory"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/inventory"); List tokenBaseLocalVars = new List(); ApiKeyToken apiKeyTokenLocalVar1 = (ApiKeyToken) await ApiKeyProvider.GetAsync("api-key", cancellationToken).ConfigureAwait(false); @@ -881,7 +881,7 @@ public async Task GetOrderByIdAsync(long orderId, Syst uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/order/{order_id}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/order/{order_id}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/order/{order_id}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Border_id%7D", Uri.EscapeDataString(orderId.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1136,7 +1136,7 @@ public async Task PlaceOrderAsync(Order order, System.Th uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/order" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/order"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/order"); httpRequestMessageLocalVar.Content = (order as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/UserApi.cs index e92a66b21b73..c6802990ffc6 100644 --- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/UserApi.cs +++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/UserApi.cs @@ -710,7 +710,7 @@ public async Task CreateUserAsync(User user, System.Thre uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user"); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -923,7 +923,7 @@ public async Task CreateUsersWithArrayInp uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/createWithArray" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/createWithArray"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/createWithArray"); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -1136,7 +1136,7 @@ public async Task CreateUsersWithListInput uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/createWithList" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/createWithList"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/createWithList"); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -1349,7 +1349,7 @@ public async Task DeleteUserAsync(string username, Syste uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/{username}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/{username}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/{username}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1556,7 +1556,7 @@ public async Task GetUserByNameAsync(string username, uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/{username}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/{username}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/{username}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1865,7 +1865,7 @@ public async Task LoginUserAsync(string password, string uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/login" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/login"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/login"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -2124,7 +2124,7 @@ public async Task LogoutUserAsync(System.Threading.Cance uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/logout" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/logout"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/logout"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -2334,7 +2334,7 @@ public async Task UpdateUserAsync(User user, string user uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/{username}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/{username}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/{username}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/AnotherFakeApi.cs index 1e622f50ec73..e108a9106564 100644 --- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/AnotherFakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -275,7 +275,7 @@ public async Task Call123TestSpecialTagsAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/another-fake/dummy" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/another-fake/dummy"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/another-fake/dummy"); httpRequestMessageLocalVar.Content = (modelClient as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/DefaultApi.cs index 46b798fe32ca..23e4f720a4b2 100644 --- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -523,7 +523,7 @@ public async Task FooGetAsync(System.Threading.CancellationT uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/foo" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/foo"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/foo"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -764,7 +764,7 @@ public async Task GetCountryAsync(string country, System uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/country" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/country"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/country"); List> formParameterLocalVars = new List>(); @@ -952,7 +952,7 @@ public async Task HelloAsync(System.Threading.CancellationTok uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/hello" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/hello"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/hello"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1170,7 +1170,7 @@ public async Task RedirectOrDefaultAsync(System.T uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/redirectOrDefault" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/redirectOrDefault"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/redirectOrDefault"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1394,7 +1394,7 @@ public async Task RolesReportGetAsync(System.Threadi uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/roles/report" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/roles/report"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/roles/report"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1612,7 +1612,7 @@ public async Task TestAsync(System.Threading.CancellationToken uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/test" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/test"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/test"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/FakeApi.cs index 54a1c8c85360..7504f8b34bca 100644 --- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/FakeApi.cs @@ -1373,7 +1373,7 @@ public async Task FakeHealthGetAsync(System.Threading uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/health" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/health"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/health"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1601,7 +1601,7 @@ public async Task FakeOuterBooleanSeriali uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/boolean" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/boolean"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/boolean"); if (body.IsSet) httpRequestMessageLocalVar.Content = (body.Value as object) is System.IO.Stream stream @@ -1856,7 +1856,7 @@ public async Task FakeOuterCompositeSer uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/composite" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/composite"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/composite"); if (outerComposite.IsSet) httpRequestMessageLocalVar.Content = (outerComposite.Value as object) is System.IO.Stream stream @@ -2098,7 +2098,7 @@ public async Task FakeOuterNumberSerialize uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/number" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/number"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/number"); if (body.IsSet) httpRequestMessageLocalVar.Content = (body.Value as object) is System.IO.Stream stream @@ -2359,7 +2359,7 @@ public async Task FakeOuterStringSerialize uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/string" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/string"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/string"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -2597,7 +2597,7 @@ public async Task GetArrayOfEnumsAsync(System.Threa uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/array-of-enums" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/array-of-enums"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/array-of-enums"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -2815,7 +2815,7 @@ public async Task GetMixedAnyOfAsync(System.Threading uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/mixed/anyOf" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/mixed/anyOf"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/mixed/anyOf"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -3033,7 +3033,7 @@ public async Task GetMixedOneOfAsync(System.Threading uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/mixed/oneOf" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/mixed/oneOf"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/mixed/oneOf"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -3274,7 +3274,7 @@ public async Task TestAdditionalP uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/additionalProperties-reference" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/additionalProperties-reference"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/additionalProperties-reference"); httpRequestMessageLocalVar.Content = (requestBody as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -3487,7 +3487,7 @@ public async Task TestBodyWithFileSchemaAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/body-with-file-schema" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/body-with-file-schema"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/body-with-file-schema"); httpRequestMessageLocalVar.Content = (fileSchemaTestClass as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -3710,7 +3710,7 @@ public async Task TestBodyWithQueryParamsAs uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/body-with-query-params" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/body-with-query-params"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/body-with-query-params"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -3929,7 +3929,7 @@ public async Task TestClientModelAsync(ModelClient uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); httpRequestMessageLocalVar.Content = (modelClient as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -4281,7 +4281,7 @@ public async Task TestEndpointParametersAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); List> formParameterLocalVars = new List>(); @@ -4607,7 +4607,7 @@ public async Task TestEnumParametersAsync(Option uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -4867,7 +4867,7 @@ public async Task TestGroupParametersAsync(bool uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -5096,7 +5096,7 @@ public async Task TestInlineAddition uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/inline-additionalProperties" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/inline-additionalProperties"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/inline-additionalProperties"); httpRequestMessageLocalVar.Content = (requestBody as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -5309,7 +5309,7 @@ public async Task TestInline uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/inline-freeform-additionalProperties" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/inline-freeform-additionalProperties"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/inline-freeform-additionalProperties"); httpRequestMessageLocalVar.Content = (testInlineFreeformAdditionalPropertiesRequest as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -5532,7 +5532,7 @@ public async Task TestJsonFormDataAsync(string par uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/jsonFormData" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/jsonFormData"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/jsonFormData"); List> formParameterLocalVars = new List>(); @@ -5817,7 +5817,7 @@ public async Task TestQueryParam uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/test-query-parameters" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/test-query-parameters"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/test-query-parameters"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -6035,7 +6035,7 @@ public async Task TestStringMapReferenceAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/stringMap-reference" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/stringMap-reference"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/stringMap-reference"); httpRequestMessageLocalVar.Content = (requestBody as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs index 7e92a4878f40..f3ac29a27b3f 100644 --- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs +++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs @@ -275,7 +275,7 @@ public async Task TestClassnameAsync(ModelClient mode uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake_classname_test" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake_classname_test"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake_classname_test"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/PetApi.cs index 01f96fd91373..018360748fba 100644 --- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/PetApi.cs +++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/PetApi.cs @@ -1075,7 +1075,7 @@ public async Task DeletePetAsync(long petId, Option FindPetsByStatusAsync(List FindPetsByTagsAsync(List t uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/pet/findByTags" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/pet/findByTags"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/pet/findByTags"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -1853,7 +1853,7 @@ public async Task GetPetByIdAsync(long petId, System.Thr uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/pet/{petId}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/pet/{petId}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/pet/{petId}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -2386,7 +2386,7 @@ public async Task UpdatePetWithFormAsync(long pet uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/pet/{petId}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/pet/{petId}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/pet/{petId}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); List> formParameterLocalVars = new List>(); @@ -2629,7 +2629,7 @@ public async Task UploadFileAsync(long petId, Option UploadFileWithRequired uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/{petId}/uploadImageWithRequiredFile" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/{petId}/uploadImageWithRequiredFile"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/{petId}/uploadImageWithRequiredFile"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); MultipartFormDataContent multipartContentLocalVar = new MultipartFormDataContent(); @@ -3203,7 +3203,7 @@ public async Task UploadFilesAsync(List DeleteOrderAsync(string orderId, Syst uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/order/{order_id}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/order/{order_id}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/order/{order_id}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Border_id%7D", Uri.EscapeDataString(orderId.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -646,7 +646,7 @@ public async Task GetInventoryAsync(System.Threading.C uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/inventory" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/inventory"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/inventory"); List tokenBaseLocalVars = new List(); ApiKeyToken apiKeyTokenLocalVar1 = (ApiKeyToken) await ApiKeyProvider.GetAsync("api-key", cancellationToken).ConfigureAwait(false); @@ -883,7 +883,7 @@ public async Task GetOrderByIdAsync(long orderId, Syst uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/order/{order_id}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/order/{order_id}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/order/{order_id}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Border_id%7D", Uri.EscapeDataString(orderId.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1138,7 +1138,7 @@ public async Task PlaceOrderAsync(Order order, System.Th uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/order" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/order"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/order"); httpRequestMessageLocalVar.Content = (order as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/UserApi.cs index bddf0a80fe51..da4e3661c441 100644 --- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/UserApi.cs +++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/UserApi.cs @@ -712,7 +712,7 @@ public async Task CreateUserAsync(User user, System.Thre uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user"); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -925,7 +925,7 @@ public async Task CreateUsersWithArrayInp uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/createWithArray" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/createWithArray"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/createWithArray"); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -1138,7 +1138,7 @@ public async Task CreateUsersWithListInput uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/createWithList" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/createWithList"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/createWithList"); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -1351,7 +1351,7 @@ public async Task DeleteUserAsync(string username, Syste uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/{username}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/{username}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/{username}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1558,7 +1558,7 @@ public async Task GetUserByNameAsync(string username, uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/{username}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/{username}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/{username}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1867,7 +1867,7 @@ public async Task LoginUserAsync(string password, string uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/login" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/login"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/login"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -2126,7 +2126,7 @@ public async Task LogoutUserAsync(System.Threading.Cance uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/logout" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/logout"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/logout"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -2336,7 +2336,7 @@ public async Task UpdateUserAsync(User user, string user uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/{username}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/{username}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/{username}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream diff --git a/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Api/DefaultApi.cs index e365df34a61b..5c7e087ff74a 100644 --- a/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -215,7 +215,7 @@ public async Task NowGetAsync(System.Threading.CancellationT uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/now" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/now"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/now"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; diff --git a/samples/client/petstore/csharp/generichost/net9/AllOf/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net9/AllOf/src/Org.OpenAPITools/Api/DefaultApi.cs index 7742edaa18e9..6e510044ff6f 100644 --- a/samples/client/petstore/csharp/generichost/net9/AllOf/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net9/AllOf/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -240,7 +240,7 @@ public async Task ListAsync(string personId, System.Threading. uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/person/display/{personId}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/person/display/{personId}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/person/display/{personId}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpersonId%7D", Uri.EscapeDataString(personId.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; diff --git a/samples/client/petstore/csharp/generichost/net9/AnyOf/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net9/AnyOf/src/Org.OpenAPITools/Api/DefaultApi.cs index 76cd3ec1f26e..951a8589ef49 100644 --- a/samples/client/petstore/csharp/generichost/net9/AnyOf/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net9/AnyOf/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -215,7 +215,7 @@ public async Task RootGetAsync(System.Threading.Cancellatio uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; diff --git a/samples/client/petstore/csharp/generichost/net9/AnyOfNoCompare/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net9/AnyOfNoCompare/src/Org.OpenAPITools/Api/DefaultApi.cs index 76cd3ec1f26e..951a8589ef49 100644 --- a/samples/client/petstore/csharp/generichost/net9/AnyOfNoCompare/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net9/AnyOfNoCompare/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -215,7 +215,7 @@ public async Task RootGetAsync(System.Threading.Cancellatio uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Api/AnotherFakeApi.cs index c05e11b53887..374598ad581f 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Api/AnotherFakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -273,7 +273,7 @@ public async Task Call123TestSpecialTagsAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/another-fake/dummy" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/another-fake/dummy"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/another-fake/dummy"); httpRequestMessageLocalVar.Content = (modelClient as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Api/DefaultApi.cs index 44d52e7e1090..5b43ed103210 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -521,7 +521,7 @@ public async Task FooGetAsync(System.Threading.CancellationT uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/foo" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/foo"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/foo"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -762,7 +762,7 @@ public async Task GetCountryAsync(string country, System uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/country" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/country"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/country"); List> formParameterLocalVars = new List>(); @@ -950,7 +950,7 @@ public async Task HelloAsync(System.Threading.CancellationTok uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/hello" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/hello"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/hello"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1168,7 +1168,7 @@ public async Task RedirectOrDefaultAsync(System.T uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/redirectOrDefault" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/redirectOrDefault"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/redirectOrDefault"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1392,7 +1392,7 @@ public async Task RolesReportGetAsync(System.Threadi uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/roles/report" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/roles/report"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/roles/report"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1610,7 +1610,7 @@ public async Task TestAsync(System.Threading.CancellationToken uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/test" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/test"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/test"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs index 0070617289e6..8a489ed1f3f3 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs @@ -1371,7 +1371,7 @@ public async Task FakeHealthGetAsync(System.Threading uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/health" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/health"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/health"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1599,7 +1599,7 @@ public async Task FakeOuterBooleanSeriali uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/boolean" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/boolean"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/boolean"); if (body.IsSet) httpRequestMessageLocalVar.Content = (body.Value as object) is System.IO.Stream stream @@ -1854,7 +1854,7 @@ public async Task FakeOuterCompositeSer uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/composite" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/composite"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/composite"); if (outerComposite.IsSet) httpRequestMessageLocalVar.Content = (outerComposite.Value as object) is System.IO.Stream stream @@ -2096,7 +2096,7 @@ public async Task FakeOuterNumberSerialize uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/number" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/number"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/number"); if (body.IsSet) httpRequestMessageLocalVar.Content = (body.Value as object) is System.IO.Stream stream @@ -2357,7 +2357,7 @@ public async Task FakeOuterStringSerialize uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/string" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/string"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/string"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -2595,7 +2595,7 @@ public async Task GetArrayOfEnumsAsync(System.Threa uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/array-of-enums" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/array-of-enums"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/array-of-enums"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -2813,7 +2813,7 @@ public async Task GetMixedAnyOfAsync(System.Threading uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/mixed/anyOf" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/mixed/anyOf"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/mixed/anyOf"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -3031,7 +3031,7 @@ public async Task GetMixedOneOfAsync(System.Threading uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/mixed/oneOf" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/mixed/oneOf"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/mixed/oneOf"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -3272,7 +3272,7 @@ public async Task TestAdditionalP uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/additionalProperties-reference" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/additionalProperties-reference"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/additionalProperties-reference"); httpRequestMessageLocalVar.Content = (requestBody as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -3485,7 +3485,7 @@ public async Task TestBodyWithFileSchemaAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/body-with-file-schema" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/body-with-file-schema"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/body-with-file-schema"); httpRequestMessageLocalVar.Content = (fileSchemaTestClass as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -3708,7 +3708,7 @@ public async Task TestBodyWithQueryParamsAs uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/body-with-query-params" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/body-with-query-params"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/body-with-query-params"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -3927,7 +3927,7 @@ public async Task TestClientModelAsync(ModelClient uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); httpRequestMessageLocalVar.Content = (modelClient as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -4279,7 +4279,7 @@ public async Task TestEndpointParametersAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); List> formParameterLocalVars = new List>(); @@ -4593,7 +4593,7 @@ public async Task TestEnumParametersAsync(Option uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -4853,7 +4853,7 @@ public async Task TestGroupParametersAsync(bool uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -5082,7 +5082,7 @@ public async Task TestInlineAddition uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/inline-additionalProperties" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/inline-additionalProperties"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/inline-additionalProperties"); httpRequestMessageLocalVar.Content = (requestBody as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -5295,7 +5295,7 @@ public async Task TestInline uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/inline-freeform-additionalProperties" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/inline-freeform-additionalProperties"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/inline-freeform-additionalProperties"); httpRequestMessageLocalVar.Content = (testInlineFreeformAdditionalPropertiesRequest as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -5518,7 +5518,7 @@ public async Task TestJsonFormDataAsync(string par uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/jsonFormData" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/jsonFormData"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/jsonFormData"); List> formParameterLocalVars = new List>(); @@ -5803,7 +5803,7 @@ public async Task TestQueryParam uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/test-query-parameters" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/test-query-parameters"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/test-query-parameters"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -6021,7 +6021,7 @@ public async Task TestStringMapReferenceAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/stringMap-reference" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/stringMap-reference"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/stringMap-reference"); httpRequestMessageLocalVar.Content = (requestBody as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs index b806d5e1d0e5..802d1fdb2ac1 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs @@ -273,7 +273,7 @@ public async Task TestClassnameAsync(ModelClient mode uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake_classname_test" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake_classname_test"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake_classname_test"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Api/PetApi.cs index aa542fd9c05b..b49539f512bb 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Api/PetApi.cs +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Api/PetApi.cs @@ -1073,7 +1073,7 @@ public async Task DeletePetAsync(long petId, Option FindPetsByStatusAsync(List FindPetsByTagsAsync(List t uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/pet/findByTags" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/pet/findByTags"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/pet/findByTags"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -1851,7 +1851,7 @@ public async Task GetPetByIdAsync(long petId, System.Thr uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/pet/{petId}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/pet/{petId}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/pet/{petId}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -2384,7 +2384,7 @@ public async Task UpdatePetWithFormAsync(long pet uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/pet/{petId}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/pet/{petId}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/pet/{petId}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); List> formParameterLocalVars = new List>(); @@ -2627,7 +2627,7 @@ public async Task UploadFileAsync(long petId, Option UploadFileWithRequired uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/{petId}/uploadImageWithRequiredFile" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/{petId}/uploadImageWithRequiredFile"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/{petId}/uploadImageWithRequiredFile"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); MultipartFormDataContent multipartContentLocalVar = new MultipartFormDataContent(); @@ -3201,7 +3201,7 @@ public async Task UploadFilesAsync(List DeleteOrderAsync(string orderId, Syst uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/order/{order_id}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/order/{order_id}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/order/{order_id}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Border_id%7D", Uri.EscapeDataString(orderId.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -644,7 +644,7 @@ public async Task GetInventoryAsync(System.Threading.C uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/inventory" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/inventory"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/inventory"); List tokenBaseLocalVars = new List(); ApiKeyToken apiKeyTokenLocalVar1 = (ApiKeyToken) await ApiKeyProvider.GetAsync("api-key", cancellationToken).ConfigureAwait(false); @@ -881,7 +881,7 @@ public async Task GetOrderByIdAsync(long orderId, Syst uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/order/{order_id}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/order/{order_id}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/order/{order_id}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Border_id%7D", Uri.EscapeDataString(orderId.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1136,7 +1136,7 @@ public async Task PlaceOrderAsync(Order order, System.Th uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/order" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/order"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/order"); httpRequestMessageLocalVar.Content = (order as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Api/UserApi.cs index e92a66b21b73..c6802990ffc6 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Api/UserApi.cs +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Api/UserApi.cs @@ -710,7 +710,7 @@ public async Task CreateUserAsync(User user, System.Thre uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user"); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -923,7 +923,7 @@ public async Task CreateUsersWithArrayInp uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/createWithArray" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/createWithArray"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/createWithArray"); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -1136,7 +1136,7 @@ public async Task CreateUsersWithListInput uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/createWithList" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/createWithList"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/createWithList"); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -1349,7 +1349,7 @@ public async Task DeleteUserAsync(string username, Syste uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/{username}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/{username}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/{username}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1556,7 +1556,7 @@ public async Task GetUserByNameAsync(string username, uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/{username}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/{username}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/{username}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1865,7 +1865,7 @@ public async Task LoginUserAsync(string password, string uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/login" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/login"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/login"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -2124,7 +2124,7 @@ public async Task LogoutUserAsync(System.Threading.Cance uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/logout" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/logout"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/logout"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -2334,7 +2334,7 @@ public async Task UpdateUserAsync(User user, string user uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/{username}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/{username}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/{username}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Api/AnotherFakeApi.cs index 1e622f50ec73..e108a9106564 100644 --- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Api/AnotherFakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -275,7 +275,7 @@ public async Task Call123TestSpecialTagsAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/another-fake/dummy" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/another-fake/dummy"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/another-fake/dummy"); httpRequestMessageLocalVar.Content = (modelClient as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Api/DefaultApi.cs index 46b798fe32ca..23e4f720a4b2 100644 --- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -523,7 +523,7 @@ public async Task FooGetAsync(System.Threading.CancellationT uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/foo" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/foo"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/foo"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -764,7 +764,7 @@ public async Task GetCountryAsync(string country, System uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/country" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/country"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/country"); List> formParameterLocalVars = new List>(); @@ -952,7 +952,7 @@ public async Task HelloAsync(System.Threading.CancellationTok uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/hello" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/hello"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/hello"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1170,7 +1170,7 @@ public async Task RedirectOrDefaultAsync(System.T uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/redirectOrDefault" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/redirectOrDefault"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/redirectOrDefault"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1394,7 +1394,7 @@ public async Task RolesReportGetAsync(System.Threadi uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/roles/report" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/roles/report"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/roles/report"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1612,7 +1612,7 @@ public async Task TestAsync(System.Threading.CancellationToken uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/test" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/test"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/test"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Api/FakeApi.cs index 54a1c8c85360..7504f8b34bca 100644 --- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Api/FakeApi.cs @@ -1373,7 +1373,7 @@ public async Task FakeHealthGetAsync(System.Threading uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/health" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/health"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/health"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1601,7 +1601,7 @@ public async Task FakeOuterBooleanSeriali uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/boolean" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/boolean"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/boolean"); if (body.IsSet) httpRequestMessageLocalVar.Content = (body.Value as object) is System.IO.Stream stream @@ -1856,7 +1856,7 @@ public async Task FakeOuterCompositeSer uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/composite" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/composite"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/composite"); if (outerComposite.IsSet) httpRequestMessageLocalVar.Content = (outerComposite.Value as object) is System.IO.Stream stream @@ -2098,7 +2098,7 @@ public async Task FakeOuterNumberSerialize uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/number" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/number"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/number"); if (body.IsSet) httpRequestMessageLocalVar.Content = (body.Value as object) is System.IO.Stream stream @@ -2359,7 +2359,7 @@ public async Task FakeOuterStringSerialize uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/string" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/string"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/string"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -2597,7 +2597,7 @@ public async Task GetArrayOfEnumsAsync(System.Threa uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/array-of-enums" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/array-of-enums"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/array-of-enums"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -2815,7 +2815,7 @@ public async Task GetMixedAnyOfAsync(System.Threading uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/mixed/anyOf" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/mixed/anyOf"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/mixed/anyOf"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -3033,7 +3033,7 @@ public async Task GetMixedOneOfAsync(System.Threading uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/mixed/oneOf" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/mixed/oneOf"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/mixed/oneOf"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -3274,7 +3274,7 @@ public async Task TestAdditionalP uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/additionalProperties-reference" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/additionalProperties-reference"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/additionalProperties-reference"); httpRequestMessageLocalVar.Content = (requestBody as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -3487,7 +3487,7 @@ public async Task TestBodyWithFileSchemaAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/body-with-file-schema" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/body-with-file-schema"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/body-with-file-schema"); httpRequestMessageLocalVar.Content = (fileSchemaTestClass as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -3710,7 +3710,7 @@ public async Task TestBodyWithQueryParamsAs uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/body-with-query-params" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/body-with-query-params"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/body-with-query-params"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -3929,7 +3929,7 @@ public async Task TestClientModelAsync(ModelClient uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); httpRequestMessageLocalVar.Content = (modelClient as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -4281,7 +4281,7 @@ public async Task TestEndpointParametersAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); List> formParameterLocalVars = new List>(); @@ -4607,7 +4607,7 @@ public async Task TestEnumParametersAsync(Option uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -4867,7 +4867,7 @@ public async Task TestGroupParametersAsync(bool uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -5096,7 +5096,7 @@ public async Task TestInlineAddition uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/inline-additionalProperties" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/inline-additionalProperties"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/inline-additionalProperties"); httpRequestMessageLocalVar.Content = (requestBody as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -5309,7 +5309,7 @@ public async Task TestInline uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/inline-freeform-additionalProperties" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/inline-freeform-additionalProperties"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/inline-freeform-additionalProperties"); httpRequestMessageLocalVar.Content = (testInlineFreeformAdditionalPropertiesRequest as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -5532,7 +5532,7 @@ public async Task TestJsonFormDataAsync(string par uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/jsonFormData" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/jsonFormData"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/jsonFormData"); List> formParameterLocalVars = new List>(); @@ -5817,7 +5817,7 @@ public async Task TestQueryParam uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/test-query-parameters" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/test-query-parameters"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/test-query-parameters"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -6035,7 +6035,7 @@ public async Task TestStringMapReferenceAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/stringMap-reference" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/stringMap-reference"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/stringMap-reference"); httpRequestMessageLocalVar.Content = (requestBody as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs index 7e92a4878f40..f3ac29a27b3f 100644 --- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs +++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs @@ -275,7 +275,7 @@ public async Task TestClassnameAsync(ModelClient mode uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake_classname_test" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake_classname_test"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake_classname_test"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Api/PetApi.cs index 01f96fd91373..018360748fba 100644 --- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Api/PetApi.cs +++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Api/PetApi.cs @@ -1075,7 +1075,7 @@ public async Task DeletePetAsync(long petId, Option FindPetsByStatusAsync(List FindPetsByTagsAsync(List t uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/pet/findByTags" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/pet/findByTags"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/pet/findByTags"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -1853,7 +1853,7 @@ public async Task GetPetByIdAsync(long petId, System.Thr uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/pet/{petId}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/pet/{petId}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/pet/{petId}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -2386,7 +2386,7 @@ public async Task UpdatePetWithFormAsync(long pet uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/pet/{petId}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/pet/{petId}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/pet/{petId}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); List> formParameterLocalVars = new List>(); @@ -2629,7 +2629,7 @@ public async Task UploadFileAsync(long petId, Option UploadFileWithRequired uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/{petId}/uploadImageWithRequiredFile" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/{petId}/uploadImageWithRequiredFile"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/{petId}/uploadImageWithRequiredFile"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); MultipartFormDataContent multipartContentLocalVar = new MultipartFormDataContent(); @@ -3203,7 +3203,7 @@ public async Task UploadFilesAsync(List DeleteOrderAsync(string orderId, Syst uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/order/{order_id}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/order/{order_id}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/order/{order_id}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Border_id%7D", Uri.EscapeDataString(orderId.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -646,7 +646,7 @@ public async Task GetInventoryAsync(System.Threading.C uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/inventory" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/inventory"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/inventory"); List tokenBaseLocalVars = new List(); ApiKeyToken apiKeyTokenLocalVar1 = (ApiKeyToken) await ApiKeyProvider.GetAsync("api-key", cancellationToken).ConfigureAwait(false); @@ -883,7 +883,7 @@ public async Task GetOrderByIdAsync(long orderId, Syst uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/order/{order_id}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/order/{order_id}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/order/{order_id}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Border_id%7D", Uri.EscapeDataString(orderId.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1138,7 +1138,7 @@ public async Task PlaceOrderAsync(Order order, System.Th uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/order" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/order"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/order"); httpRequestMessageLocalVar.Content = (order as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Api/UserApi.cs index bddf0a80fe51..da4e3661c441 100644 --- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Api/UserApi.cs +++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Api/UserApi.cs @@ -712,7 +712,7 @@ public async Task CreateUserAsync(User user, System.Thre uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user"); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -925,7 +925,7 @@ public async Task CreateUsersWithArrayInp uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/createWithArray" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/createWithArray"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/createWithArray"); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -1138,7 +1138,7 @@ public async Task CreateUsersWithListInput uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/createWithList" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/createWithList"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/createWithList"); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -1351,7 +1351,7 @@ public async Task DeleteUserAsync(string username, Syste uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/{username}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/{username}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/{username}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1558,7 +1558,7 @@ public async Task GetUserByNameAsync(string username, uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/{username}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/{username}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/{username}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1867,7 +1867,7 @@ public async Task LoginUserAsync(string password, string uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/login" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/login"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/login"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -2126,7 +2126,7 @@ public async Task LogoutUserAsync(System.Threading.Cance uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/logout" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/logout"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/logout"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -2336,7 +2336,7 @@ public async Task UpdateUserAsync(User user, string user uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/{username}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/{username}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/{username}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream diff --git a/samples/client/petstore/csharp/generichost/net9/OneOf/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net9/OneOf/src/Org.OpenAPITools/Api/DefaultApi.cs index 76cd3ec1f26e..951a8589ef49 100644 --- a/samples/client/petstore/csharp/generichost/net9/OneOf/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net9/OneOf/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -215,7 +215,7 @@ public async Task RootGetAsync(System.Threading.Cancellatio uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs index c05e11b53887..374598ad581f 100644 --- a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -273,7 +273,7 @@ public async Task Call123TestSpecialTagsAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/another-fake/dummy" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/another-fake/dummy"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/another-fake/dummy"); httpRequestMessageLocalVar.Content = (modelClient as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Api/DefaultApi.cs index 44d52e7e1090..5b43ed103210 100644 --- a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -521,7 +521,7 @@ public async Task FooGetAsync(System.Threading.CancellationT uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/foo" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/foo"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/foo"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -762,7 +762,7 @@ public async Task GetCountryAsync(string country, System uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/country" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/country"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/country"); List> formParameterLocalVars = new List>(); @@ -950,7 +950,7 @@ public async Task HelloAsync(System.Threading.CancellationTok uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/hello" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/hello"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/hello"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1168,7 +1168,7 @@ public async Task RedirectOrDefaultAsync(System.T uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/redirectOrDefault" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/redirectOrDefault"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/redirectOrDefault"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1392,7 +1392,7 @@ public async Task RolesReportGetAsync(System.Threadi uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/roles/report" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/roles/report"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/roles/report"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1610,7 +1610,7 @@ public async Task TestAsync(System.Threading.CancellationToken uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/test" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/test"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/test"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs index 482421f8c4ea..271fbfea2636 100644 --- a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs @@ -1371,7 +1371,7 @@ public async Task FakeHealthGetAsync(System.Threading uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/health" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/health"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/health"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1599,7 +1599,7 @@ public async Task FakeOuterBooleanSeriali uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/boolean" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/boolean"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/boolean"); if (body.IsSet) httpRequestMessageLocalVar.Content = (body.Value as object) is System.IO.Stream stream @@ -1854,7 +1854,7 @@ public async Task FakeOuterCompositeSer uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/composite" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/composite"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/composite"); if (outerComposite.IsSet) httpRequestMessageLocalVar.Content = (outerComposite.Value as object) is System.IO.Stream stream @@ -2096,7 +2096,7 @@ public async Task FakeOuterNumberSerialize uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/number" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/number"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/number"); if (body.IsSet) httpRequestMessageLocalVar.Content = (body.Value as object) is System.IO.Stream stream @@ -2357,7 +2357,7 @@ public async Task FakeOuterStringSerialize uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/string" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/string"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/string"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -2595,7 +2595,7 @@ public async Task GetArrayOfEnumsAsync(System.Threa uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/array-of-enums" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/array-of-enums"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/array-of-enums"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -2813,7 +2813,7 @@ public async Task GetMixedAnyOfAsync(System.Threading uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/mixed/anyOf" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/mixed/anyOf"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/mixed/anyOf"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -3031,7 +3031,7 @@ public async Task GetMixedOneOfAsync(System.Threading uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/mixed/oneOf" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/mixed/oneOf"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/mixed/oneOf"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -3272,7 +3272,7 @@ public async Task TestAdditionalP uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/additionalProperties-reference" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/additionalProperties-reference"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/additionalProperties-reference"); httpRequestMessageLocalVar.Content = (requestBody as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -3485,7 +3485,7 @@ public async Task TestBodyWithFileSchemaAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/body-with-file-schema" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/body-with-file-schema"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/body-with-file-schema"); httpRequestMessageLocalVar.Content = (fileSchemaTestClass as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -3708,7 +3708,7 @@ public async Task TestBodyWithQueryParamsAs uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/body-with-query-params" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/body-with-query-params"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/body-with-query-params"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -3927,7 +3927,7 @@ public async Task TestClientModelAsync(ModelClient uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); httpRequestMessageLocalVar.Content = (modelClient as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -4279,7 +4279,7 @@ public async Task TestEndpointParametersAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); List> formParameterLocalVars = new List>(); @@ -4605,7 +4605,7 @@ public async Task TestEnumParametersAsync(Option uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -4865,7 +4865,7 @@ public async Task TestGroupParametersAsync(bool uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -5094,7 +5094,7 @@ public async Task TestInlineAddition uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/inline-additionalProperties" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/inline-additionalProperties"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/inline-additionalProperties"); httpRequestMessageLocalVar.Content = (requestBody as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -5307,7 +5307,7 @@ public async Task TestInline uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/inline-freeform-additionalProperties" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/inline-freeform-additionalProperties"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/inline-freeform-additionalProperties"); httpRequestMessageLocalVar.Content = (testInlineFreeformAdditionalPropertiesRequest as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -5530,7 +5530,7 @@ public async Task TestJsonFormDataAsync(string par uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/jsonFormData" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/jsonFormData"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/jsonFormData"); List> formParameterLocalVars = new List>(); @@ -5815,7 +5815,7 @@ public async Task TestQueryParam uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/test-query-parameters" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/test-query-parameters"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/test-query-parameters"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -6033,7 +6033,7 @@ public async Task TestStringMapReferenceAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/stringMap-reference" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/stringMap-reference"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/stringMap-reference"); httpRequestMessageLocalVar.Content = (requestBody as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs index b806d5e1d0e5..802d1fdb2ac1 100644 --- a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs +++ b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs @@ -273,7 +273,7 @@ public async Task TestClassnameAsync(ModelClient mode uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake_classname_test" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake_classname_test"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake_classname_test"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Api/PetApi.cs index 20f9ce2ce945..4e99649609ef 100644 --- a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Api/PetApi.cs +++ b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Api/PetApi.cs @@ -1073,7 +1073,7 @@ public async Task DeletePetAsync(long petId, Option FindPetsByStatusAsync(List FindPetsByTagsAsync(List t uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/pet/findByTags" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/pet/findByTags"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/pet/findByTags"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -1851,7 +1851,7 @@ public async Task GetPetByIdAsync(long petId, System.Thr uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/pet/{petId}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/pet/{petId}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/pet/{petId}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -2384,7 +2384,7 @@ public async Task UpdatePetWithFormAsync(long pet uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/pet/{petId}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/pet/{petId}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/pet/{petId}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); List> formParameterLocalVars = new List>(); @@ -2627,7 +2627,7 @@ public async Task UploadFileAsync(long petId, Option UploadFileWithRequired uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/{petId}/uploadImageWithRequiredFile" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/{petId}/uploadImageWithRequiredFile"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/{petId}/uploadImageWithRequiredFile"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); MultipartFormDataContent multipartContentLocalVar = new MultipartFormDataContent(); @@ -3201,7 +3201,7 @@ public async Task UploadFilesAsync(List DeleteOrderAsync(string orderId, Syst uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/order/{order_id}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/order/{order_id}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/order/{order_id}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Border_id%7D", Uri.EscapeDataString(orderId.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -644,7 +644,7 @@ public async Task GetInventoryAsync(System.Threading.C uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/inventory" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/inventory"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/inventory"); List tokenBaseLocalVars = new List(); ApiKeyToken apiKeyTokenLocalVar1 = (ApiKeyToken) await ApiKeyProvider.GetAsync("api-key", cancellationToken).ConfigureAwait(false); @@ -881,7 +881,7 @@ public async Task GetOrderByIdAsync(long orderId, Syst uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/order/{order_id}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/order/{order_id}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/order/{order_id}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Border_id%7D", Uri.EscapeDataString(orderId.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1136,7 +1136,7 @@ public async Task PlaceOrderAsync(Order order, System.Th uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/order" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/order"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/order"); httpRequestMessageLocalVar.Content = (order as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Api/UserApi.cs index e92a66b21b73..c6802990ffc6 100644 --- a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Api/UserApi.cs +++ b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Api/UserApi.cs @@ -710,7 +710,7 @@ public async Task CreateUserAsync(User user, System.Thre uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user"); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -923,7 +923,7 @@ public async Task CreateUsersWithArrayInp uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/createWithArray" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/createWithArray"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/createWithArray"); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -1136,7 +1136,7 @@ public async Task CreateUsersWithListInput uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/createWithList" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/createWithList"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/createWithList"); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -1349,7 +1349,7 @@ public async Task DeleteUserAsync(string username, Syste uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/{username}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/{username}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/{username}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1556,7 +1556,7 @@ public async Task GetUserByNameAsync(string username, uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/{username}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/{username}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/{username}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1865,7 +1865,7 @@ public async Task LoginUserAsync(string password, string uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/login" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/login"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/login"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -2124,7 +2124,7 @@ public async Task LogoutUserAsync(System.Threading.Cance uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/logout" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/logout"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/logout"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -2334,7 +2334,7 @@ public async Task UpdateUserAsync(User user, string user uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/{username}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/{username}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/{username}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Api/AnotherFakeApi.cs index 1e622f50ec73..e108a9106564 100644 --- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Api/AnotherFakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -275,7 +275,7 @@ public async Task Call123TestSpecialTagsAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/another-fake/dummy" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/another-fake/dummy"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/another-fake/dummy"); httpRequestMessageLocalVar.Content = (modelClient as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Api/DefaultApi.cs index 46b798fe32ca..23e4f720a4b2 100644 --- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -523,7 +523,7 @@ public async Task FooGetAsync(System.Threading.CancellationT uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/foo" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/foo"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/foo"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -764,7 +764,7 @@ public async Task GetCountryAsync(string country, System uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/country" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/country"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/country"); List> formParameterLocalVars = new List>(); @@ -952,7 +952,7 @@ public async Task HelloAsync(System.Threading.CancellationTok uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/hello" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/hello"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/hello"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1170,7 +1170,7 @@ public async Task RedirectOrDefaultAsync(System.T uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/redirectOrDefault" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/redirectOrDefault"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/redirectOrDefault"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1394,7 +1394,7 @@ public async Task RolesReportGetAsync(System.Threadi uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/roles/report" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/roles/report"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/roles/report"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1612,7 +1612,7 @@ public async Task TestAsync(System.Threading.CancellationToken uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/test" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/test"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/test"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Api/FakeApi.cs index 54a1c8c85360..7504f8b34bca 100644 --- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Api/FakeApi.cs @@ -1373,7 +1373,7 @@ public async Task FakeHealthGetAsync(System.Threading uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/health" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/health"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/health"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1601,7 +1601,7 @@ public async Task FakeOuterBooleanSeriali uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/boolean" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/boolean"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/boolean"); if (body.IsSet) httpRequestMessageLocalVar.Content = (body.Value as object) is System.IO.Stream stream @@ -1856,7 +1856,7 @@ public async Task FakeOuterCompositeSer uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/composite" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/composite"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/composite"); if (outerComposite.IsSet) httpRequestMessageLocalVar.Content = (outerComposite.Value as object) is System.IO.Stream stream @@ -2098,7 +2098,7 @@ public async Task FakeOuterNumberSerialize uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/number" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/number"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/number"); if (body.IsSet) httpRequestMessageLocalVar.Content = (body.Value as object) is System.IO.Stream stream @@ -2359,7 +2359,7 @@ public async Task FakeOuterStringSerialize uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/string" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/string"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/string"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -2597,7 +2597,7 @@ public async Task GetArrayOfEnumsAsync(System.Threa uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/array-of-enums" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/array-of-enums"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/array-of-enums"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -2815,7 +2815,7 @@ public async Task GetMixedAnyOfAsync(System.Threading uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/mixed/anyOf" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/mixed/anyOf"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/mixed/anyOf"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -3033,7 +3033,7 @@ public async Task GetMixedOneOfAsync(System.Threading uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/mixed/oneOf" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/mixed/oneOf"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/mixed/oneOf"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -3274,7 +3274,7 @@ public async Task TestAdditionalP uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/additionalProperties-reference" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/additionalProperties-reference"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/additionalProperties-reference"); httpRequestMessageLocalVar.Content = (requestBody as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -3487,7 +3487,7 @@ public async Task TestBodyWithFileSchemaAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/body-with-file-schema" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/body-with-file-schema"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/body-with-file-schema"); httpRequestMessageLocalVar.Content = (fileSchemaTestClass as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -3710,7 +3710,7 @@ public async Task TestBodyWithQueryParamsAs uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/body-with-query-params" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/body-with-query-params"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/body-with-query-params"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -3929,7 +3929,7 @@ public async Task TestClientModelAsync(ModelClient uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); httpRequestMessageLocalVar.Content = (modelClient as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -4281,7 +4281,7 @@ public async Task TestEndpointParametersAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); List> formParameterLocalVars = new List>(); @@ -4607,7 +4607,7 @@ public async Task TestEnumParametersAsync(Option uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -4867,7 +4867,7 @@ public async Task TestGroupParametersAsync(bool uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -5096,7 +5096,7 @@ public async Task TestInlineAddition uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/inline-additionalProperties" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/inline-additionalProperties"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/inline-additionalProperties"); httpRequestMessageLocalVar.Content = (requestBody as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -5309,7 +5309,7 @@ public async Task TestInline uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/inline-freeform-additionalProperties" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/inline-freeform-additionalProperties"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/inline-freeform-additionalProperties"); httpRequestMessageLocalVar.Content = (testInlineFreeformAdditionalPropertiesRequest as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -5532,7 +5532,7 @@ public async Task TestJsonFormDataAsync(string par uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/jsonFormData" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/jsonFormData"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/jsonFormData"); List> formParameterLocalVars = new List>(); @@ -5817,7 +5817,7 @@ public async Task TestQueryParam uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/test-query-parameters" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/test-query-parameters"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/test-query-parameters"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -6035,7 +6035,7 @@ public async Task TestStringMapReferenceAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/stringMap-reference" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/stringMap-reference"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/stringMap-reference"); httpRequestMessageLocalVar.Content = (requestBody as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs index 7e92a4878f40..f3ac29a27b3f 100644 --- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs +++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs @@ -275,7 +275,7 @@ public async Task TestClassnameAsync(ModelClient mode uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake_classname_test" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake_classname_test"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake_classname_test"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Api/PetApi.cs index 01f96fd91373..018360748fba 100644 --- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Api/PetApi.cs +++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Api/PetApi.cs @@ -1075,7 +1075,7 @@ public async Task DeletePetAsync(long petId, Option FindPetsByStatusAsync(List FindPetsByTagsAsync(List t uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/pet/findByTags" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/pet/findByTags"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/pet/findByTags"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -1853,7 +1853,7 @@ public async Task GetPetByIdAsync(long petId, System.Thr uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/pet/{petId}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/pet/{petId}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/pet/{petId}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -2386,7 +2386,7 @@ public async Task UpdatePetWithFormAsync(long pet uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/pet/{petId}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/pet/{petId}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/pet/{petId}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); List> formParameterLocalVars = new List>(); @@ -2629,7 +2629,7 @@ public async Task UploadFileAsync(long petId, Option UploadFileWithRequired uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/{petId}/uploadImageWithRequiredFile" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/{petId}/uploadImageWithRequiredFile"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/{petId}/uploadImageWithRequiredFile"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); MultipartFormDataContent multipartContentLocalVar = new MultipartFormDataContent(); @@ -3203,7 +3203,7 @@ public async Task UploadFilesAsync(List DeleteOrderAsync(string orderId, Syst uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/order/{order_id}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/order/{order_id}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/order/{order_id}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Border_id%7D", Uri.EscapeDataString(orderId.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -646,7 +646,7 @@ public async Task GetInventoryAsync(System.Threading.C uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/inventory" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/inventory"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/inventory"); List tokenBaseLocalVars = new List(); ApiKeyToken apiKeyTokenLocalVar1 = (ApiKeyToken) await ApiKeyProvider.GetAsync("api-key", cancellationToken).ConfigureAwait(false); @@ -883,7 +883,7 @@ public async Task GetOrderByIdAsync(long orderId, Syst uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/order/{order_id}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/order/{order_id}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/order/{order_id}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Border_id%7D", Uri.EscapeDataString(orderId.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1138,7 +1138,7 @@ public async Task PlaceOrderAsync(Order order, System.Th uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/order" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/order"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/order"); httpRequestMessageLocalVar.Content = (order as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Api/UserApi.cs index bddf0a80fe51..da4e3661c441 100644 --- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Api/UserApi.cs +++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Api/UserApi.cs @@ -712,7 +712,7 @@ public async Task CreateUserAsync(User user, System.Thre uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user"); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -925,7 +925,7 @@ public async Task CreateUsersWithArrayInp uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/createWithArray" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/createWithArray"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/createWithArray"); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -1138,7 +1138,7 @@ public async Task CreateUsersWithListInput uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/createWithList" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/createWithList"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/createWithList"); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -1351,7 +1351,7 @@ public async Task DeleteUserAsync(string username, Syste uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/{username}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/{username}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/{username}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1558,7 +1558,7 @@ public async Task GetUserByNameAsync(string username, uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/{username}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/{username}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/{username}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1867,7 +1867,7 @@ public async Task LoginUserAsync(string password, string uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/login" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/login"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/login"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -2126,7 +2126,7 @@ public async Task LogoutUserAsync(System.Threading.Cance uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/logout" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/logout"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/logout"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -2336,7 +2336,7 @@ public async Task UpdateUserAsync(User user, string user uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/{username}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/{username}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/{username}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream diff --git a/samples/client/petstore/csharp/generichost/net9/UseDateTimeForDate/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net9/UseDateTimeForDate/src/Org.OpenAPITools/Api/DefaultApi.cs index e365df34a61b..5c7e087ff74a 100644 --- a/samples/client/petstore/csharp/generichost/net9/UseDateTimeForDate/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net9/UseDateTimeForDate/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -215,7 +215,7 @@ public async Task NowGetAsync(System.Threading.CancellationT uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/now" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/now"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/now"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs index 56fb2e9f03eb..d5ef07d0af6c 100644 --- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs +++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -272,7 +272,7 @@ public async Task Call123TestSpecialTagsAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/another-fake/dummy" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/another-fake/dummy"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/another-fake/dummy"); httpRequestMessageLocalVar.Content = (modelClient as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/DefaultApi.cs index a37b13115c90..dc821468334b 100644 --- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -520,7 +520,7 @@ public async Task FooGetAsync(System.Threading.CancellationT uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/foo" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/foo"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/foo"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -760,7 +760,7 @@ public async Task GetCountryAsync(string country, System uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/country" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/country"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/country"); List> formParameterLocalVars = new List>(); @@ -948,7 +948,7 @@ public async Task HelloAsync(System.Threading.CancellationTok uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/hello" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/hello"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/hello"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1165,7 +1165,7 @@ public async Task RedirectOrDefaultAsync(System.T uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/redirectOrDefault" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/redirectOrDefault"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/redirectOrDefault"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1388,7 +1388,7 @@ public async Task RolesReportGetAsync(System.Threadi uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/roles/report" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/roles/report"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/roles/report"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1605,7 +1605,7 @@ public async Task TestAsync(System.Threading.CancellationToken uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/test" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/test"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/test"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs index 33cecd82aa0a..0cde2825a8f0 100644 --- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs @@ -1370,7 +1370,7 @@ public async Task FakeHealthGetAsync(System.Threading uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/health" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/health"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/health"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1597,7 +1597,7 @@ public async Task FakeOuterBooleanSeriali uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/boolean" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/boolean"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/boolean"); if (body.IsSet) httpRequestMessageLocalVar.Content = (body.Value as object) is System.IO.Stream stream @@ -1851,7 +1851,7 @@ public async Task FakeOuterCompositeSer uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/composite" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/composite"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/composite"); if (outerComposite.IsSet) httpRequestMessageLocalVar.Content = (outerComposite.Value as object) is System.IO.Stream stream @@ -2092,7 +2092,7 @@ public async Task FakeOuterNumberSerialize uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/number" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/number"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/number"); if (body.IsSet) httpRequestMessageLocalVar.Content = (body.Value as object) is System.IO.Stream stream @@ -2352,7 +2352,7 @@ public async Task FakeOuterStringSerialize uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/outer/string" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/outer/string"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/outer/string"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -2589,7 +2589,7 @@ public async Task GetArrayOfEnumsAsync(System.Threa uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/array-of-enums" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/array-of-enums"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/array-of-enums"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -2806,7 +2806,7 @@ public async Task GetMixedAnyOfAsync(System.Threading uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/mixed/anyOf" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/mixed/anyOf"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/mixed/anyOf"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -3023,7 +3023,7 @@ public async Task GetMixedOneOfAsync(System.Threading uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/mixed/oneOf" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/mixed/oneOf"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/mixed/oneOf"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -3263,7 +3263,7 @@ public async Task TestAdditionalP uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/additionalProperties-reference" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/additionalProperties-reference"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/additionalProperties-reference"); httpRequestMessageLocalVar.Content = (requestBody as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -3476,7 +3476,7 @@ public async Task TestBodyWithFileSchemaAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/body-with-file-schema" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/body-with-file-schema"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/body-with-file-schema"); httpRequestMessageLocalVar.Content = (fileSchemaTestClass as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -3699,7 +3699,7 @@ public async Task TestBodyWithQueryParamsAs uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/body-with-query-params" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/body-with-query-params"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/body-with-query-params"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -3918,7 +3918,7 @@ public async Task TestClientModelAsync(ModelClient uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); httpRequestMessageLocalVar.Content = (modelClient as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -4269,7 +4269,7 @@ public async Task TestEndpointParametersAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); List> formParameterLocalVars = new List>(); @@ -4595,7 +4595,7 @@ public async Task TestEnumParametersAsync(Option uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -4855,7 +4855,7 @@ public async Task TestGroupParametersAsync(bool uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -5083,7 +5083,7 @@ public async Task TestInlineAddition uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/inline-additionalProperties" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/inline-additionalProperties"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/inline-additionalProperties"); httpRequestMessageLocalVar.Content = (requestBody as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -5296,7 +5296,7 @@ public async Task TestInline uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/inline-freeform-additionalProperties" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/inline-freeform-additionalProperties"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/inline-freeform-additionalProperties"); httpRequestMessageLocalVar.Content = (testInlineFreeformAdditionalPropertiesRequest as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -5519,7 +5519,7 @@ public async Task TestJsonFormDataAsync(string par uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/jsonFormData" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/jsonFormData"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/jsonFormData"); List> formParameterLocalVars = new List>(); @@ -5804,7 +5804,7 @@ public async Task TestQueryParam uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/test-query-parameters" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/test-query-parameters"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/test-query-parameters"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -6021,7 +6021,7 @@ public async Task TestStringMapReferenceAsyn uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/stringMap-reference" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/stringMap-reference"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/stringMap-reference"); httpRequestMessageLocalVar.Content = (requestBody as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs index 6019be100cd3..3513619a880c 100644 --- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs +++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs @@ -272,7 +272,7 @@ public async Task TestClassnameAsync(ModelClient mode uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake_classname_test" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake_classname_test"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake_classname_test"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/PetApi.cs index 71b38eb5b6cf..00d88c157501 100644 --- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/PetApi.cs +++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/PetApi.cs @@ -1072,7 +1072,7 @@ public async Task DeletePetAsync(long petId, Option FindPetsByStatusAsync(List FindPetsByTagsAsync(List t uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/pet/findByTags" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/pet/findByTags"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/pet/findByTags"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -1847,7 +1847,7 @@ public async Task GetPetByIdAsync(long petId, System.Thr uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/pet/{petId}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/pet/{petId}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/pet/{petId}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -2379,7 +2379,7 @@ public async Task UpdatePetWithFormAsync(long pet uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/pet/{petId}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/pet/{petId}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/pet/{petId}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); List> formParameterLocalVars = new List>(); @@ -2622,7 +2622,7 @@ public async Task UploadFileAsync(long petId, Option UploadFileWithRequired uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/fake/{petId}/uploadImageWithRequiredFile" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/fake/{petId}/uploadImageWithRequiredFile"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/fake/{petId}/uploadImageWithRequiredFile"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); MultipartFormDataContent multipartContentLocalVar = new MultipartFormDataContent(); @@ -3194,7 +3194,7 @@ public async Task UploadFilesAsync(List DeleteOrderAsync(string orderId, Syst uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/order/{order_id}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/order/{order_id}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/order/{order_id}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Border_id%7D", Uri.EscapeDataString(orderId.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -642,7 +642,7 @@ public async Task GetInventoryAsync(System.Threading.C uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/inventory" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/inventory"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/inventory"); List tokenBaseLocalVars = new List(); ApiKeyToken apiKeyTokenLocalVar1 = (ApiKeyToken) await ApiKeyProvider.GetAsync("api-key", cancellationToken).ConfigureAwait(false); @@ -878,7 +878,7 @@ public async Task GetOrderByIdAsync(long orderId, Syst uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/order/{order_id}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/order/{order_id}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/order/{order_id}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Border_id%7D", Uri.EscapeDataString(orderId.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1132,7 +1132,7 @@ public async Task PlaceOrderAsync(Order order, System.Th uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/store/order" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/store/order"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/store/order"); httpRequestMessageLocalVar.Content = (order as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/UserApi.cs index 023e0a9cd9aa..4f5e5922505b 100644 --- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/UserApi.cs +++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/UserApi.cs @@ -701,7 +701,7 @@ public async Task CreateUserAsync(User user, System.Thre uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user"); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -914,7 +914,7 @@ public async Task CreateUsersWithArrayInp uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/createWithArray" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/createWithArray"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/createWithArray"); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -1127,7 +1127,7 @@ public async Task CreateUsersWithListInput uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/createWithList" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/createWithList"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/createWithList"); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream ? httpRequestMessageLocalVar.Content = new StreamContent(stream) @@ -1340,7 +1340,7 @@ public async Task DeleteUserAsync(string username, Syste uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/{username}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/{username}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/{username}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1546,7 +1546,7 @@ public async Task GetUserByNameAsync(string username, uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/{username}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/{username}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/{username}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; @@ -1854,7 +1854,7 @@ public async Task LoginUserAsync(string password, string uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/login" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/login"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/login"); System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); @@ -2085,7 +2085,7 @@ public async Task LogoutUserAsync(System.Threading.Cance uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/logout" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/logout"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/logout"); httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; httpRequestMessageLocalVar.Method = new HttpMethod("GET"); @@ -2294,7 +2294,7 @@ public async Task UpdateUserAsync(User user, string user uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/" ? "/user/{username}" - : string.Concat(HttpClient.BaseAddress.AbsolutePath, "/user/{username}"); + : string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/user/{username}"); uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream