From d39a4f0b5da3a4591589473db8e1e1f9e2dcf3b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Chalet?= <kevinchalet@gmail.com>
Date: Mon, 27 Jun 2022 01:26:35 +0200
Subject: [PATCH] Update the System.Net.Http integration packages to explicitly
 reference Polly.Extensions.Http

---
 Packages.props                                       |  1 +
 sandbox/OpenIddict.Sandbox.AspNet.Client/Web.config  | 12 ++++++++++++
 sandbox/OpenIddict.Sandbox.AspNet.Server/Web.config  | 12 ++++++++++++
 .../OpenIddict.Client.SystemNetHttp.csproj           |  8 ++++++++
 .../OpenIddict.Validation.SystemNetHttp.csproj       |  8 ++++++++
 5 files changed, 41 insertions(+)

diff --git a/Packages.props b/Packages.props
index b9521fbe..72432fe5 100644
--- a/Packages.props
+++ b/Packages.props
@@ -35,6 +35,7 @@
     <PackageReference Update="MongoDB.Driver" Version="2.10.4" />
     <PackageReference Update="Moq" Version="4.18.1" />
     <PackageReference Update="Newtonsoft.Json" Version="10.0.3" />
+    <PackageReference Update="Polly.Extensions.Http" Version="3.0.0" />
     <PackageReference Update="Portable.BouncyCastle" Version="1.9.0" />
     <PackageReference Update="Quartz.Extensions.DependencyInjection" Version="3.4.0" />
     <PackageReference Update="Quartz.Extensions.Hosting" Version="3.4.0" />
diff --git a/sandbox/OpenIddict.Sandbox.AspNet.Client/Web.config b/sandbox/OpenIddict.Sandbox.AspNet.Client/Web.config
index 00f16a2b..c270c150 100644
--- a/sandbox/OpenIddict.Sandbox.AspNet.Client/Web.config
+++ b/sandbox/OpenIddict.Sandbox.AspNet.Client/Web.config
@@ -130,6 +130,18 @@
         <bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
       </dependentAssembly>
     </assemblyBinding>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Polly" publicKeyToken="c8a3ffc3f8f825cc" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="7.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Polly.Extensions.Http" publicKeyToken="c8a3ffc3f8f825cc" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="3.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
   </runtime>
   <system.codedom>
     <compilers>
diff --git a/sandbox/OpenIddict.Sandbox.AspNet.Server/Web.config b/sandbox/OpenIddict.Sandbox.AspNet.Server/Web.config
index c05060bc..dbeeefd5 100644
--- a/sandbox/OpenIddict.Sandbox.AspNet.Server/Web.config
+++ b/sandbox/OpenIddict.Sandbox.AspNet.Server/Web.config
@@ -154,6 +154,18 @@
         <bindingRedirect oldVersion="0.0.0.0-5.2.8.0" newVersion="5.2.8.0" />
       </dependentAssembly>
     </assemblyBinding>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Polly" publicKeyToken="c8a3ffc3f8f825cc" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="7.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Polly.Extensions.Http" publicKeyToken="c8a3ffc3f8f825cc" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="3.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
   </runtime>
   <entityFramework>
     <providers>
diff --git a/src/OpenIddict.Client.SystemNetHttp/OpenIddict.Client.SystemNetHttp.csproj b/src/OpenIddict.Client.SystemNetHttp/OpenIddict.Client.SystemNetHttp.csproj
index 6dce3998..e691f9b3 100644
--- a/src/OpenIddict.Client.SystemNetHttp/OpenIddict.Client.SystemNetHttp.csproj
+++ b/src/OpenIddict.Client.SystemNetHttp/OpenIddict.Client.SystemNetHttp.csproj
@@ -14,7 +14,15 @@
   </ItemGroup>
 
   <ItemGroup>
+    <!--
+      Note: while brought transitively by the Microsoft.Extensions.Http.Polly package,
+      the Polly.Extensions.Http dependency is explicitly added to work around a breaking
+      change introduced between Polly 6.x and 7.x and force both this package and applications
+      that reference OpenIddict.Validation.SystemNetHttp to use the latest Polly version (7.x).
+    -->
+
     <PackageReference Include="Microsoft.Extensions.Http.Polly" />
+    <PackageReference Include="Polly.Extensions.Http" />
     <PackageReference Include="System.Net.Http.Json" />
   </ItemGroup>
 
diff --git a/src/OpenIddict.Validation.SystemNetHttp/OpenIddict.Validation.SystemNetHttp.csproj b/src/OpenIddict.Validation.SystemNetHttp/OpenIddict.Validation.SystemNetHttp.csproj
index eae90f4b..2b8fc69b 100644
--- a/src/OpenIddict.Validation.SystemNetHttp/OpenIddict.Validation.SystemNetHttp.csproj
+++ b/src/OpenIddict.Validation.SystemNetHttp/OpenIddict.Validation.SystemNetHttp.csproj
@@ -14,7 +14,15 @@
   </ItemGroup>
 
   <ItemGroup>
+    <!--
+      Note: while brought transitively by the Microsoft.Extensions.Http.Polly package,
+      the Polly.Extensions.Http dependency is explicitly added to work around a breaking
+      change introduced between Polly 6.x and 7.x and force both this package and applications
+      that reference OpenIddict.Validation.SystemNetHttp to use the latest Polly version (7.x).
+    -->
+    
     <PackageReference Include="Microsoft.Extensions.Http.Polly" />
+    <PackageReference Include="Polly.Extensions.Http" />
     <PackageReference Include="System.Net.Http.Json" />
   </ItemGroup>