From af9f6a66a2edcf0078aaadb015ea4a8f87cf0198 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Chalet?= <kevinchalet@gmail.com>
Date: Sat, 21 May 2022 15:37:53 +0200
Subject: [PATCH] Update the System.Net.Http integrations to support
 HttpRequestMessage.VersionPolicy

---
 Directory.Build.targets                                      | 1 +
 .../OpenIddictClientSystemNetHttpHandlers.cs                 | 5 +++++
 .../OpenIddictValidationSystemNetHttpHandlers.cs             | 5 +++++
 3 files changed, 11 insertions(+)

diff --git a/Directory.Build.targets b/Directory.Build.targets
index bf296bb2..10fa1262 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -82,6 +82,7 @@
   <PropertyGroup
     Condition=" ('$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '5.0'))) ">
     <DefineConstants>$(DefineConstants);SUPPORTS_MULTIPLE_VALUES_IN_QUERYHELPERS</DefineConstants>
+    <DefineConstants>$(DefineConstants);SUPPORTS_HTTP_CLIENT_DEFAULT_REQUEST_VERSION_POLICY</DefineConstants>
   </PropertyGroup>
 
   <PropertyGroup
diff --git a/src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpHandlers.cs b/src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpHandlers.cs
index 69184a58..3f9abd42 100644
--- a/src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpHandlers.cs
+++ b/src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpHandlers.cs
@@ -257,6 +257,11 @@ public static partial class OpenIddictClientSystemNetHttpHandlers
             // If supported, import the HTTP version from the client instance.
             request.Version = client.DefaultRequestVersion;
 #endif
+
+#if SUPPORTS_HTTP_CLIENT_DEFAULT_REQUEST_VERSION_POLICY
+            // If supported, import the HTTP version policy from the client instance.
+            request.VersionPolicy = client.DefaultVersionPolicy;
+#endif
             HttpResponseMessage response;
 
             try
diff --git a/src/OpenIddict.Validation.SystemNetHttp/OpenIddictValidationSystemNetHttpHandlers.cs b/src/OpenIddict.Validation.SystemNetHttp/OpenIddictValidationSystemNetHttpHandlers.cs
index c3ed9070..ec927942 100644
--- a/src/OpenIddict.Validation.SystemNetHttp/OpenIddictValidationSystemNetHttpHandlers.cs
+++ b/src/OpenIddict.Validation.SystemNetHttp/OpenIddictValidationSystemNetHttpHandlers.cs
@@ -256,6 +256,11 @@ public static partial class OpenIddictValidationSystemNetHttpHandlers
             // If supported, import the HTTP version from the client instance.
             request.Version = client.DefaultRequestVersion;
 #endif
+
+#if SUPPORTS_HTTP_CLIENT_DEFAULT_REQUEST_VERSION_POLICY
+            // If supported, import the HTTP version policy from the client instance.
+            request.VersionPolicy = client.DefaultVersionPolicy;
+#endif
             HttpResponseMessage response;
 
             try