Skip to content

Commit 1abceab

Browse files
authored
#2308 In .NET 4.6.2, URLs do not execute Escape. (#2327)
#2308 In .NET 4.6.2, URLs do not execute Escape. #2308
1 parent fea9198 commit 1abceab

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

src/RestSharp/Request/UriExtensions.cs

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,11 @@ public static Uri MergeBaseUrlAndResource(this Uri? baseUrl, string? resource) {
3131

3232
var usingBaseUri = baseUrl.AbsoluteUri[^1] == '/' || assembled.IsEmpty() ? baseUrl : new(baseUrl.AbsoluteUri + "/");
3333

34-
return assembled != null ? new(usingBaseUri, assembled) : baseUrl;
34+
#if NETSTANDARD2_0
35+
return !string.IsNullOrWhiteSpace(assembled) ? new(usingBaseUri, assembled, true) : baseUrl;
36+
#else
37+
return !string.IsNullOrWhiteSpace(assembled) ? new(usingBaseUri, assembled) : baseUrl;
38+
#endif
3539
}
3640

3741
public static Uri AddQueryString(this Uri uri, string? query) {
@@ -50,7 +54,11 @@ public static UrlSegmentParamsValues GetUrlSegmentParamsValues(
5054
params ParametersCollection[] parametersCollections
5155
) {
5256
var assembled = baseUri == null ? "" : resource;
53-
var baseUrl = baseUri ?? new Uri(resource);
57+
#if NETSTANDARD2_0
58+
var baseUrl = baseUri ?? new Uri(resource, true);
59+
#else
60+
var baseUrl = baseUri ?? new Uri(resource);
61+
#endif
5462

5563
var hasResource = !assembled.IsEmpty();
5664

0 commit comments

Comments
 (0)