Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Version and HttpVersionPolicy support for HttpRequestMessage #1800

Merged
merged 17 commits into from
Sep 15, 2024
Merged

Add Version and HttpVersionPolicy support for HttpRequestMessage #1800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
193e6ba
Add Version and HttpVersionPolicy support for HttpRequestMessage
infofromca Aug 31, 2024
9f72bc1
Add one more #if NET6_0_OR_GREATER
infofromca Aug 31, 2024
80807e2
Merge branch 'main' into HttpVersionPolicy
infofromca Aug 31, 2024
880a545
Merge branch 'main' into HttpVersionPolicy
ChrisPulman Sep 1, 2024
da565c5
Merge branch 'main' into HttpVersionPolicy
infofromca Sep 2, 2024
12bfc06
Merge branch 'HttpVersionPolicy' of https://github.com/infofromca/ref…
infofromca Sep 2, 2024
2a310f5
Merge branch 'main' into HttpVersionPolicy
ChrisPulman Sep 5, 2024
20e675f
Merge branch 'main' into HttpVersionPolicy
ChrisPulman Sep 6, 2024
27fff66
Fixes a build error because of VS automatic code
infofromca Sep 8, 2024
ce7e66f
Merge branch 'HttpVersionPolicy' of https://github.com/infofromca/ref…
infofromca Sep 8, 2024
bdc0d5b
Merge branch 'main' into HttpVersionPolicy
ChrisPulman Sep 8, 2024
44eceaa
Fixes test verification error
infofromca Sep 8, 2024
746896c
Merge branch 'HttpVersionPolicy' of https://github.com/infofromca/ref…
infofromca Sep 8, 2024
c48ee45
Try the test again
infofromca Sep 15, 2024
caa6002
Merge branch 'main' into HttpVersionPolicy
infofromca Sep 15, 2024
ed29ccb
Fix API Tests
ChrisPulman Sep 15, 2024
d171ac1
Merge branch 'main' into HttpVersionPolicy
ChrisPulman Sep 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Refit.Tests/API/ApiApprovalTests.Refit.DotNet6_0.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,8 @@ namespace Refit
public System.Collections.Generic.Dictionary<string, object>? HttpRequestMessageOptions { get; set; }
public Refit.IUrlParameterFormatter UrlParameterFormatter { get; set; }
public Refit.IUrlParameterKeyFormatter UrlParameterKeyFormatter { get; set; }
public System.Version Version { get; set; }
public System.Net.Http.HttpVersionPolicy VersionPolicy { get; set; }
}
public static class RequestBuilder
{
Expand Down
2 changes: 2 additions & 0 deletions Refit.Tests/API/ApiApprovalTests.Refit.DotNet8_0.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,8 @@ namespace Refit
public System.Collections.Generic.Dictionary<string, object>? HttpRequestMessageOptions { get; set; }
public Refit.IUrlParameterFormatter UrlParameterFormatter { get; set; }
public Refit.IUrlParameterKeyFormatter UrlParameterKeyFormatter { get; set; }
public System.Version Version { get; set; }
public System.Net.Http.HttpVersionPolicy VersionPolicy { get; set; }
}
public static class RequestBuilder
{
Expand Down
7 changes: 7 additions & 0 deletions Refit/RefitSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Reflection;
using System.Runtime.Serialization;
Expand Down Expand Up @@ -127,6 +128,12 @@ public Func<
/// Optional Key-Value pairs, which are displayed in the property <see cref="HttpRequestMessage.Properties"/>.
/// </summary>
public Dictionary<string, object>? HttpRequestMessageOptions { get; set; }

#if NET6_0_OR_GREATER
public Version Version { get; set; } = HttpVersion.Version11;

public System.Net.Http.HttpVersionPolicy VersionPolicy { get; set; } = HttpVersionPolicy.RequestVersionOrLower;
#endif
}

/// <summary>
Expand Down
12 changes: 11 additions & 1 deletion Refit/RequestBuilderImplementation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -737,7 +737,9 @@ bool paramsContainsCancellationToken
AddHeadersToRequest(headersToAdd, ret);

AddPropertiesToRequest(restMethod, ret, paramList);

#if NET6_0_OR_GREATER
AddVersionToRequest(ret);
#endif
// NB: The URI methods in .NET are dumb. Also, we do this
// UriBuilder business so that we preserve any hardcoded query
// parameters as well as add the parameterized ones.
Expand Down Expand Up @@ -1032,6 +1034,14 @@ void AddPropertiesToRequest(RestMethodInfoInternal restMethod, HttpRequestMessag
#endif
}

void AddVersionToRequest(HttpRequestMessage ret)
{
#if NET6_0_OR_GREATER
ret.Version = settings.Version;
ret.VersionPolicy = settings.VersionPolicy;
#endif
}

IEnumerable<KeyValuePair<string, string?>> ParseQueryParameter(
object? param,
ParameterInfo parameterInfo,
Expand Down
Loading