Skip to content

Commit 04699ff

Browse files
committed
Ok, it is dontEscape so needs to be true.
1 parent af7d572 commit 04699ff

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

src/RestSharp/Request/UriExtensions.cs

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@ public static Uri MergeBaseUrlAndResource(this Uri? baseUrl, string? resource) {
3636
#if NET6_0_OR_GREATER
3737
? new Uri(assembled, UriOptions)
3838
#else
39-
? new Uri(assembled, false)
39+
#pragma warning disable CS0618 // Type or member is obsolete
40+
? new Uri(assembled, true)
41+
#pragma warning restore CS0618 // Type or member is obsolete
4042
#endif
4143
: throw new ArgumentException("Both BaseUrl and Resource are empty", nameof(resource));
4244
}
@@ -53,8 +55,10 @@ public static Uri MergeBaseUrlAndResource(this Uri? baseUrl, string? resource) {
5355

5456
return assembled != null ? new Uri(isResourceAbsolute ? assembled : $"{usingBaseUri.AbsoluteUri}{assembled}", UriOptions) : baseUrl;
5557
#else
56-
var usingBaseUri = baseUrl.AbsoluteUri.EndsWith("/") || assembled.IsEmpty() ? baseUrl : new Uri($"{baseUrl.AbsoluteUri}/", false);
57-
return assembled != null ? new Uri(usingBaseUri, assembled, false) : baseUrl;
58+
#pragma warning disable CS0618 // Type or member is obsolete
59+
var usingBaseUri = baseUrl.AbsoluteUri.EndsWith("/") || assembled.IsEmpty() ? baseUrl : new Uri($"{baseUrl.AbsoluteUri}/", true);
60+
return assembled != null ? new Uri(usingBaseUri, assembled, true) : baseUrl;
61+
#pragma warning restore CS0618 // Type or member is obsolete
5862
#endif
5963
}
6064

@@ -66,10 +70,10 @@ public static Uri AddQueryString(this Uri uri, string? query) {
6670

6771
var result =
6872
#if NET6_0_OR_GREATER
69-
new Uri($"{absoluteUri}{separator}{query}", new UriCreationOptions { DangerousDisablePathAndQueryCanonicalization = true });
73+
new Uri($"{absoluteUri}{separator}{query}", UriOptions);
7074
#else
7175
#pragma warning disable CS0618 // Type or member is obsolete
72-
new Uri($"{absoluteUri}{separator}{query}", false);
76+
new Uri($"{absoluteUri}{separator}{query}", true);
7377
#pragma warning restore CS0618 // Type or member is obsolete
7478
#endif
7579
return result;

0 commit comments

Comments
 (0)