Update dependencies

mattbrailsford · mattbrailsford · commit 1fc0adef706a · 2023-12-14T11:16:53.000Z
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -6,12 +6,13 @@
     <GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
     <GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.5.119" />
     <GlobalPackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.435" />
-    <GlobalPackageReference Include="Umbraco.Code" Version="2.0.0" />
+    <GlobalPackageReference Include="Umbraco.Code" Version="2.1.0" />
     <GlobalPackageReference Include="Umbraco.GitVersioning.Extensions" Version="0.2.0" />
   </ItemGroup>
   <ItemGroup>
-    <PackageVersion Include="Flurl.Http" Version="[3.2.4, 4)" />
-    <PackageVersion Include="Umbraco.Commerce.Core" Version="[13.0.0-rc1, 14)" />
+    <PackageVersion Include="Flurl.Http" Version="[4.0.0, 5)" />
+    <PackageVersion Include="Flurl.Http.Newtonsoft" Version="[0.9.0, 1)" />
+    <PackageVersion Include="Umbraco.Commerce.Core" Version="[13.0.0, 14)" />
     <PackageVersion Include="Microsoft.AspNet.WebApi.Client" Version="[6, 7)" />
   </ItemGroup>
 </Project>
diff --git a/src/Umbraco.Commerce.PaymentProviders.Quickpay/Api/QuickpayClient.cs b/src/Umbraco.Commerce.PaymentProviders.Quickpay/Api/QuickpayClient.cs
@@ -1,5 +1,5 @@
 using Flurl.Http;
-using Flurl.Http.Configuration;
+using Flurl.Http.Newtonsoft;
 using Newtonsoft.Json;
 using System;
 using System.Threading;
@@ -21,7 +21,7 @@ public async Task<QuickpayPayment> CreatePaymentAsync(QuickpayPaymentRequest dat
         {
             return await RequestAsync("/payments", async (req, ct) => await req
                 .WithHeader("Content-Type", "application/json")
-                .PostJsonAsync(data, ct)
+                .PostJsonAsync(data, cancellationToken: ct)
                 .ReceiveJson<QuickpayPayment>().ConfigureAwait(false),
                 cancellationToken).ConfigureAwait(false);
         }
@@ -30,15 +30,15 @@ public async Task<PaymentLinkUrl> CreatePaymentLinkAsync(string paymentId, Quick
         {
             return await RequestAsync($"/payments/{paymentId}/link", async (req, ct) => await req
                 .WithHeader("Content-Type", "application/json")
-                .PutJsonAsync(data, ct)
+                .PutJsonAsync(data, cancellationToken: ct)
                 .ReceiveJson<PaymentLinkUrl>().ConfigureAwait(false),
                 cancellationToken).ConfigureAwait(false);
         }
 
         public async Task<QuickpayPayment> GetPaymentAsync(string paymentId, CancellationToken cancellationToken = default)
         {
             return await RequestAsync($"/payments/{paymentId}", async (req, ct) => await req
-                .GetJsonAsync<QuickpayPayment>(ct).ConfigureAwait(false),
+                .GetJsonAsync<QuickpayPayment>(cancellationToken: ct).ConfigureAwait(false),
                 cancellationToken).ConfigureAwait(false);
         }
 
@@ -47,7 +47,7 @@ public async Task<QuickpayPayment> CancelPaymentAsync(string paymentId, Cancella
             return await RequestAsync($"/payments/{paymentId}/cancel", async (req, ct) => await req
                 .WithHeader("Content-Type", "application/json")
                 .SetQueryParam("synchronized", string.Empty)
-                .PostJsonAsync(null, ct)
+                .PostJsonAsync(null, cancellationToken: ct)
                 .ReceiveJson<QuickpayPayment>().ConfigureAwait(false),
                 cancellationToken).ConfigureAwait(false);
         }
@@ -57,7 +57,7 @@ public async Task<QuickpayPayment> CapturePaymentAsync(string paymentId, object
             return await RequestAsync($"/payments/{paymentId}/capture", async (req, ct) => await req
                 .WithHeader("Content-Type", "application/json")
                 .SetQueryParam("synchronized", string.Empty)
-                .PostJsonAsync(data, ct)
+                .PostJsonAsync(data, cancellationToken: ct)
                 .ReceiveJson<QuickpayPayment>().ConfigureAwait(false),
                 cancellationToken).ConfigureAwait(false);
         }
@@ -67,7 +67,7 @@ public async Task<QuickpayPayment> RefundPaymentAsync(string paymentId, object d
             return await RequestAsync($"/payments/{paymentId}/refund", async (req, ct) => await req
                 .WithHeader("Content-Type", "application/json")
                 .SetQueryParam("synchronized", string.Empty)
-                .PostJsonAsync(data, ct)
+                .PostJsonAsync(data, cancellationToken: ct)
                 .ReceiveJson<QuickpayPayment>().ConfigureAwait(false),
                 cancellationToken).ConfigureAwait(false);
         }
@@ -79,7 +79,7 @@ private async Task<TResult> RequestAsync<TResult>(string url, Func<IFlurlRequest
             try
             {
                 var req = new FlurlRequest(_config.BaseUrl + url)
-                        .ConfigureRequest(x =>
+                        .WithSettings(x =>
                         {
                             var jsonSettings = new JsonSerializerSettings
                             {
diff --git a/src/Umbraco.Commerce.PaymentProviders.Quickpay/Umbraco.Commerce.PaymentProviders.Quickpay.csproj b/src/Umbraco.Commerce.PaymentProviders.Quickpay/Umbraco.Commerce.PaymentProviders.Quickpay.csproj
@@ -1,4 +1,4 @@
-﻿<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
       <Title>Umbraco Commerce Quickpay Payment Provider</Title>
@@ -7,6 +7,7 @@
 
     <ItemGroup>
       <PackageReference Include="Flurl.Http" />
+      <PackageReference Include="Flurl.Http.Newtonsoft" />
       <PackageReference Include="Microsoft.AspNet.WebApi.Client"  />
       <PackageReference Include="Umbraco.Commerce.Core" />
     </ItemGroup>
diff --git a/src/Umbraco.Commerce.PaymentProviders.Quickpay/packages.lock.json b/src/Umbraco.Commerce.PaymentProviders.Quickpay/packages.lock.json

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`using Flurl.Http;`
`2`		`-using Flurl.Http.Configuration;`
	`2`	`+using Flurl.Http.Newtonsoft;`
`3`	`3`	`using Newtonsoft.Json;`
`4`	`4`	`using System;`
`5`	`5`	`using System.Threading;`
`@@ -21,7 +21,7 @@ public async Task<QuickpayPayment> CreatePaymentAsync(QuickpayPaymentRequest dat`
`21`	`21`	`{`
`22`	`22`	`return await RequestAsync("/payments", async (req, ct) => await req`
`23`	`23`	`.WithHeader("Content-Type", "application/json")`
`24`		`- .PostJsonAsync(data, ct)`
	`24`	`+ .PostJsonAsync(data, cancellationToken: ct)`
`25`	`25`	`.ReceiveJson<QuickpayPayment>().ConfigureAwait(false),`
`26`	`26`	`cancellationToken).ConfigureAwait(false);`
`27`	`27`	`}`
`@@ -30,15 +30,15 @@ public async Task<PaymentLinkUrl> CreatePaymentLinkAsync(string paymentId, Quick`
`30`	`30`	`{`
`31`	`31`	`return await RequestAsync($"/payments/{paymentId}/link", async (req, ct) => await req`
`32`	`32`	`.WithHeader("Content-Type", "application/json")`
`33`		`- .PutJsonAsync(data, ct)`
	`33`	`+ .PutJsonAsync(data, cancellationToken: ct)`
`34`	`34`	`.ReceiveJson<PaymentLinkUrl>().ConfigureAwait(false),`
`35`	`35`	`cancellationToken).ConfigureAwait(false);`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`public async Task<QuickpayPayment> GetPaymentAsync(string paymentId, CancellationToken cancellationToken = default)`
`39`	`39`	`{`
`40`	`40`	`return await RequestAsync($"/payments/{paymentId}", async (req, ct) => await req`
`41`		`- .GetJsonAsync<QuickpayPayment>(ct).ConfigureAwait(false),`
	`41`	`+ .GetJsonAsync<QuickpayPayment>(cancellationToken: ct).ConfigureAwait(false),`
`42`	`42`	`cancellationToken).ConfigureAwait(false);`
`43`	`43`	`}`
`44`	`44`
`@@ -47,7 +47,7 @@ public async Task<QuickpayPayment> CancelPaymentAsync(string paymentId, Cancella`
`47`	`47`	`return await RequestAsync($"/payments/{paymentId}/cancel", async (req, ct) => await req`
`48`	`48`	`.WithHeader("Content-Type", "application/json")`
`49`	`49`	`.SetQueryParam("synchronized", string.Empty)`
`50`		`- .PostJsonAsync(null, ct)`
	`50`	`+ .PostJsonAsync(null, cancellationToken: ct)`
`51`	`51`	`.ReceiveJson<QuickpayPayment>().ConfigureAwait(false),`
`52`	`52`	`cancellationToken).ConfigureAwait(false);`
`53`	`53`	`}`
`@@ -57,7 +57,7 @@ public async Task<QuickpayPayment> CapturePaymentAsync(string paymentId, object`
`57`	`57`	`return await RequestAsync($"/payments/{paymentId}/capture", async (req, ct) => await req`
`58`	`58`	`.WithHeader("Content-Type", "application/json")`
`59`	`59`	`.SetQueryParam("synchronized", string.Empty)`
`60`		`- .PostJsonAsync(data, ct)`
	`60`	`+ .PostJsonAsync(data, cancellationToken: ct)`
`61`	`61`	`.ReceiveJson<QuickpayPayment>().ConfigureAwait(false),`
`62`	`62`	`cancellationToken).ConfigureAwait(false);`
`63`	`63`	`}`
`@@ -67,7 +67,7 @@ public async Task<QuickpayPayment> RefundPaymentAsync(string paymentId, object d`
`67`	`67`	`return await RequestAsync($"/payments/{paymentId}/refund", async (req, ct) => await req`
`68`	`68`	`.WithHeader("Content-Type", "application/json")`
`69`	`69`	`.SetQueryParam("synchronized", string.Empty)`
`70`		`- .PostJsonAsync(data, ct)`
	`70`	`+ .PostJsonAsync(data, cancellationToken: ct)`
`71`	`71`	`.ReceiveJson<QuickpayPayment>().ConfigureAwait(false),`
`72`	`72`	`cancellationToken).ConfigureAwait(false);`
`73`	`73`	`}`
`@@ -79,7 +79,7 @@ private async Task<TResult> RequestAsync<TResult>(string url, Func<IFlurlRequest`
`79`	`79`	`try`
`80`	`80`	`{`
`81`	`81`	`var req = new FlurlRequest(_config.BaseUrl + url)`
`82`		`- .ConfigureRequest(x =>`
	`82`	`+ .WithSettings(x =>`
`83`	`83`	`{`
`84`	`84`	`var jsonSettings = new JsonSerializerSettings`
`85`	`85`	`{`