Skip to content

Commit 5a4a62b

Browse files
mattbrailsfordmattbrailsford
committed
Retarget for v10 / .net 6
1 parent 5b25b65 commit 5a4a62b

File tree

5 files changed

+59
-56
lines changed

5 files changed

+59
-56
lines changed

‎Directory.Build.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<TargetFramework>net7.0</TargetFramework>
3+
<TargetFramework>net6.0</TargetFramework>
44
<Company>Umbraco HQ</Company>
55
<Authors>Umbraco</Authors>
66
<Copyright>Copyright © Umbraco $([System.DateTime]::Today.ToString('yyyy'))</Copyright>
@@ -33,7 +33,7 @@
3333
<!-- Package validation -->
3434
<PropertyGroup>
3535
<EnablePackageValidation>false</EnablePackageValidation>
36-
<PackageValidationBaselineVersion>12.0.0</PackageValidationBaselineVersion>
36+
<PackageValidationBaselineVersion>10.0.0</PackageValidationBaselineVersion>
3737
<EnableStrictModeForCompatibleFrameworksInPackage>true</EnableStrictModeForCompatibleFrameworksInPackage>
3838
<EnableStrictModeForCompatibleTfms>true</EnableStrictModeForCompatibleTfms>
3939
</PropertyGroup>

‎Directory.Packages.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</ItemGroup>
1212
<ItemGroup>
1313
<PackageVersion Include="Flurl.Http" Version="[3.2.4, 4)" />
14-
<PackageVersion Include="Umbraco.Commerce.Core" Version="[12.0.0-rc1, 13)" />
14+
<PackageVersion Include="Umbraco.Commerce.Core" Version="[10.0.0--rc1.preview.7, 12)" />
1515
<PackageVersion Include="Microsoft.AspNet.WebApi.Client" Version="[5.2.7, 6)" />
1616
</ItemGroup>
1717
</Project>

‎src/Umbraco.Commerce.PaymentProviders.Quickpay/QuickpayCheckoutPaymentProvider.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ public async Task<QuickpayPayment> ParseCallbackAsync(HttpRequestMessage request
417417

418418
using (var reader = new StreamReader(stream))
419419
{
420-
var json = await reader.ReadToEndAsync(cancellationToken).ConfigureAwait(false);
420+
var json = await reader.ReadToEndAsync().ConfigureAwait(false);
421421

422422
// Deserialize json body text
423423
return JsonConvert.DeserializeObject<QuickpayPayment>(json);

‎src/Umbraco.Commerce.PaymentProviders.Quickpay/packages.lock.json‎

Lines changed: 54 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"version": 2,
33
"dependencies": {
4-
"net7.0": {
4+
"net6.0": {
55
"Flurl.Http": {
66
"type": "Direct",
77
"requested": "[3.2.4, 4.0.0)",
@@ -59,18 +59,18 @@
5959
},
6060
"Umbraco.Commerce.Core": {
6161
"type": "Direct",
62-
"requested": "[12.0.0-rc1, 13.0.0)",
63-
"resolved": "12.0.0-rc1",
64-
"contentHash": "Hnuo0lL+TdIf2Dmnz2VTneuAb3QLjzdXDT5DuNWdcjOMDX6knOeldvnWAif+q7REkHLC0zrf2MO8R2uPBB4ZVQ==",
62+
"requested": "[10.0.0--rc1.preview.7, 12.0.0)",
63+
"resolved": "10.0.0--rc1.preview.7.g1fde6e9",
64+
"contentHash": "FA5VDKIUP1HWDpFe7rwmo8ydpo2FeT6zLBXb1oKfpL+lUoGPoS4QLcaUQnxNN/3c3vMN93VAXRkSo+a4uofWNQ==",
6565
"dependencies": {
66-
"Microsoft.Extensions.Configuration.Abstractions": "[7.0.0, 8.0.0)",
67-
"Microsoft.Extensions.DependencyInjection.Abstractions": "[7.0.0, 8.0.0)",
68-
"Microsoft.Extensions.Options": "[7.0.0, 8.0.0)",
66+
"Microsoft.Extensions.Configuration.Abstractions": "[6.0.0, 8.0.0)",
67+
"Microsoft.Extensions.DependencyInjection.Abstractions": "[6.0.0, 8.0.0)",
68+
"Microsoft.Extensions.Options": "[6.0.0, 8.0.0)",
6969
"Newtonsoft.Json": "[13.0.0, 14.0.0)",
7070
"RT.Comb": "[2.5.0, 3.0.0)",
7171
"System.Linq.Dynamic.Core": "[1.2.10, 2.0.0)",
72-
"System.Runtime.Caching": "[7.0.0, 8.0.0)",
73-
"Umbraco.Commerce.Common": "12.0.0-rc1"
72+
"System.Runtime.Caching": "[6.0.0, 8.0.0)",
73+
"Umbraco.Commerce.Common": "10.0.0--rc1.preview.7.g1fde6e9"
7474
}
7575
},
7676
"Umbraco.GitVersioning.Extensions": {
@@ -167,30 +167,33 @@
167167
},
168168
"Microsoft.Extensions.Configuration.Abstractions": {
169169
"type": "Transitive",
170-
"resolved": "7.0.0",
171-
"contentHash": "f34u2eaqIjNO9YLHBz8rozVZ+TcFiFs0F3r7nUJd7FRkVSxk8u4OpoK226mi49MwexHOR2ibP9MFvRUaLilcQQ==",
170+
"resolved": "6.0.0",
171+
"contentHash": "qWzV9o+ZRWq+pGm+1dF+R7qTgTYoXvbyowRoBxQJGfqTpqDun2eteerjRQhq5PQ/14S+lqto3Ft4gYaRyl4rdQ==",
172172
"dependencies": {
173-
"Microsoft.Extensions.Primitives": "7.0.0"
173+
"Microsoft.Extensions.Primitives": "6.0.0"
174174
}
175175
},
176176
"Microsoft.Extensions.DependencyInjection.Abstractions": {
177177
"type": "Transitive",
178-
"resolved": "7.0.0",
179-
"contentHash": "h3j/QfmFN4S0w4C2A6X7arXij/M/OVw3uQHSOFxnND4DyAzO1F9eMX7Eti7lU/OkSthEE0WzRsfT/Dmx86jzCw=="
178+
"resolved": "6.0.0",
179+
"contentHash": "xlzi2IYREJH3/m6+lUrQlujzX8wDitm4QGnUu6kUXTQAWPuZY8i+ticFJbzfqaetLA6KR/rO6Ew/HuYD+bxifg=="
180180
},
181181
"Microsoft.Extensions.Options": {
182182
"type": "Transitive",
183-
"resolved": "7.0.0",
184-
"contentHash": "lP1yBnTTU42cKpMozuafbvNtQ7QcBjr/CcK3bYOGEMH55Fjt+iecXjT6chR7vbgCMqy3PG3aNQSZgo/EuY/9qQ==",
183+
"resolved": "6.0.0",
184+
"contentHash": "dzXN0+V1AyjOe2xcJ86Qbo233KHuLEY0njf/P2Kw8SfJU+d45HNS2ctJdnEnrWbM9Ye2eFgaC5Mj9otRMU6IsQ==",
185185
"dependencies": {
186-
"Microsoft.Extensions.DependencyInjection.Abstractions": "7.0.0",
187-
"Microsoft.Extensions.Primitives": "7.0.0"
186+
"Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
187+
"Microsoft.Extensions.Primitives": "6.0.0"
188188
}
189189
},
190190
"Microsoft.Extensions.Primitives": {
191191
"type": "Transitive",
192-
"resolved": "7.0.0",
193-
"contentHash": "um1KU5kxcRp3CNuI8o/GrZtD4AIOXDk+RLsytjZ9QPok3ttLUelLKpilVPuaFT3TFjOhSibUAso0odbOaCDj3Q=="
192+
"resolved": "6.0.0",
193+
"contentHash": "9+PnzmQFfEFNR9J2aDTfJGGupShHjOuGw4VUv+JB044biSHrnmCIMD+mJHmb2H7YryrfBEXDurxQ47gJZdCKNQ==",
194+
"dependencies": {
195+
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
196+
}
194197
},
195198
"Microsoft.NETCore.Platforms": {
196199
"type": "Transitive",
@@ -219,8 +222,8 @@
219222
},
220223
"Microsoft.Win32.SystemEvents": {
221224
"type": "Transitive",
222-
"resolved": "7.0.0",
223-
"contentHash": "2nXPrhdAyAzir0gLl8Yy8S5Mnm/uBSQQA7jEsILOS1MTyS7DbmV1NgViMtvV1sfCD1ebITpNwb1NIinKeJgUVQ=="
225+
"resolved": "6.0.0",
226+
"contentHash": "hqTM5628jSsQiv+HGpiq3WKBl2c8v1KZfby2J6Pr7pEPlK9waPdgEO6b8A/+/xn/yZ9ulv8HuqK71ONy2tg67A=="
224227
},
225228
"NETStandard.Library": {
226229
"type": "Transitive",
@@ -554,12 +557,11 @@
554557
},
555558
"System.Configuration.ConfigurationManager": {
556559
"type": "Transitive",
557-
"resolved": "7.0.0",
558-
"contentHash": "WvRUdlL1lB0dTRZSs5XcQOd5q9MYNk90GkbmRmiCvRHThWiojkpGqWdmEDJdXyHbxG/BhE5hmVbMfRLXW9FJVA==",
560+
"resolved": "6.0.0",
561+
"contentHash": "7T+m0kDSlIPTHIkPMIu6m6tV6qsMqJpvQWW2jIc2qi7sn40qxFo0q+7mEQAhMPXZHMKnWrnv47ntGlM/ejvw3g==",
559562
"dependencies": {
560-
"System.Diagnostics.EventLog": "7.0.0",
561-
"System.Security.Cryptography.ProtectedData": "7.0.0",
562-
"System.Security.Permissions": "7.0.0"
563+
"System.Security.Cryptography.ProtectedData": "6.0.0",
564+
"System.Security.Permissions": "6.0.0"
563565
}
564566
},
565567
"System.Console": {
@@ -596,11 +598,6 @@
596598
"System.Threading": "4.3.0"
597599
}
598600
},
599-
"System.Diagnostics.EventLog": {
600-
"type": "Transitive",
601-
"resolved": "7.0.0",
602-
"contentHash": "eUDP47obqQm3SFJfP6z+Fx2nJ4KKTQbXB4Q9Uesnzw9SbYdhjyoGXuvDn/gEmFY6N5Z3bFFbpAQGA7m6hrYJCw=="
603-
},
604601
"System.Diagnostics.Tools": {
605602
"type": "Transitive",
606603
"resolved": "4.3.0",
@@ -623,10 +620,10 @@
623620
},
624621
"System.Drawing.Common": {
625622
"type": "Transitive",
626-
"resolved": "7.0.0",
627-
"contentHash": "KIX+oBU38pxkKPxvLcLfIkOV5Ien8ReN78wro7OF5/erwcmortzeFx+iBswlh2Vz6gVne0khocQudGwaO1Ey6A==",
623+
"resolved": "6.0.0",
624+
"contentHash": "NfuoKUiP2nUWwKZN6twGqXioIe1zVD0RIj2t976A+czLHr2nY454RwwXs6JU9Htc6mwqL6Dn/nEL3dpVf2jOhg==",
628625
"dependencies": {
629-
"Microsoft.Win32.SystemEvents": "7.0.0"
626+
"Microsoft.Win32.SystemEvents": "6.0.0"
630627
}
631628
},
632629
"System.Globalization": {
@@ -959,16 +956,16 @@
959956
},
960957
"System.Runtime.Caching": {
961958
"type": "Transitive",
962-
"resolved": "7.0.0",
963-
"contentHash": "M0riW7Zgxca3Elp1iZVhzH7PWWT5bPSrdMFGCAGoH1n9YLuXOYE78ryui051Icf3swWWa8feBRoSxOCYwgMy8w==",
959+
"resolved": "6.0.0",
960+
"contentHash": "E0e03kUp5X2k+UAoVl6efmI7uU7JRBWi5EIdlQ7cr0NpBGjHG4fWII35PgsBY9T4fJQ8E4QPsL0rKksU9gcL5A==",
964961
"dependencies": {
965-
"System.Configuration.ConfigurationManager": "7.0.0"
962+
"System.Configuration.ConfigurationManager": "6.0.0"
966963
}
967964
},
968965
"System.Runtime.CompilerServices.Unsafe": {
969966
"type": "Transitive",
970-
"resolved": "5.0.0",
971-
"contentHash": "ZD9TMpsmYJLrxbbmdvhwt9YEgG5WntEnZ/d1eH8JBX9LBp+Ju8BSBhUGbZMNVHHomWo2KVImJhTDl2hIgw/6MA=="
967+
"resolved": "6.0.0",
968+
"contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg=="
972969
},
973970
"System.Runtime.Extensions": {
974971
"type": "Transitive",
@@ -1028,6 +1025,11 @@
10281025
"System.Runtime.Extensions": "4.3.0"
10291026
}
10301027
},
1028+
"System.Security.AccessControl": {
1029+
"type": "Transitive",
1030+
"resolved": "6.0.0",
1031+
"contentHash": "AUADIc0LIEQe7MzC+I0cl0rAT8RrTAKFHl53yHjEUzNVIaUlhFY11vc2ebiVJzVBuOzun6F7FBA+8KAbGTTedQ=="
1032+
},
10311033
"System.Security.Cryptography.Algorithms": {
10321034
"type": "Transitive",
10331035
"resolved": "4.3.0",
@@ -1142,8 +1144,8 @@
11421144
},
11431145
"System.Security.Cryptography.ProtectedData": {
11441146
"type": "Transitive",
1145-
"resolved": "7.0.0",
1146-
"contentHash": "xSPiLNlHT6wAHtugASbKAJwV5GVqQK351crnILAucUioFqqieDN79evO1rku1ckt/GfjIn+b17UaSskoY03JuA=="
1147+
"resolved": "6.0.0",
1148+
"contentHash": "rp1gMNEZpvx9vP0JW0oHLxlf8oSiQgtno77Y4PLUBjSiDYoD77Y8uXHr1Ea5XG4/pIKhqAdxZ8v8OTUtqo9PeQ=="
11471149
},
11481150
"System.Security.Cryptography.X509Certificates": {
11491151
"type": "Transitive",
@@ -1179,10 +1181,11 @@
11791181
},
11801182
"System.Security.Permissions": {
11811183
"type": "Transitive",
1182-
"resolved": "7.0.0",
1183-
"contentHash": "Vmp0iRmCEno9BWiskOW5pxJ3d9n+jUqKxvX4GhLwFhnQaySZmBN2FuC0N5gjFHgyFMUjC5sfIJ8KZfoJwkcMmA==",
1184+
"resolved": "6.0.0",
1185+
"contentHash": "T/uuc7AklkDoxmcJ7LGkyX1CcSviZuLCa4jg3PekfJ7SU0niF0IVTXwUiNVP9DSpzou2PpxJ+eNY2IfDM90ZCg==",
11841186
"dependencies": {
1185-
"System.Windows.Extensions": "7.0.0"
1187+
"System.Security.AccessControl": "6.0.0",
1188+
"System.Windows.Extensions": "6.0.0"
11861189
}
11871190
},
11881191
"System.Text.Encoding": {
@@ -1259,10 +1262,10 @@
12591262
},
12601263
"System.Windows.Extensions": {
12611264
"type": "Transitive",
1262-
"resolved": "7.0.0",
1263-
"contentHash": "bR4qdCmssMMbo9Fatci49An5B1UaVJZHKNq70PRgzoLYIlitb8Tj7ns/Xt5Pz1CkERiTjcVBDU2y1AVrPBYkaw==",
1265+
"resolved": "6.0.0",
1266+
"contentHash": "IXoJOXIqc39AIe+CIR7koBtRGMiCt/LPM3lI+PELtDIy9XdyeSrwXFdWV9dzJ2Awl0paLWUaknLxFQ5HpHZUog==",
12641267
"dependencies": {
1265-
"System.Drawing.Common": "7.0.0"
1268+
"System.Drawing.Common": "6.0.0"
12661269
}
12671270
},
12681271
"System.Xml.ReaderWriter": {
@@ -1308,11 +1311,11 @@
13081311
},
13091312
"Umbraco.Commerce.Common": {
13101313
"type": "Transitive",
1311-
"resolved": "12.0.0-rc1",
1312-
"contentHash": "iyOg7W3pjxyR6l+EwNYF6wB9Jj2f7/GWOwscz6gV7VKqTdVWbhoPHyOAT27u+J3xufS7BK85l7kBmTydjcgLNA==",
1314+
"resolved": "10.0.0--rc1.preview.7.g1fde6e9",
1315+
"contentHash": "uvL0XBgP9PPkmdUI/YptIc9FLDXWCwuoBr+bC3BxrPfMu/PRu7KX3lo8HqAQleSL5BEEa+6afZzg3zperQR3UA==",
13131316
"dependencies": {
13141317
"CompareNETObjects": "[4.75.0, 5.0.0)",
1315-
"Microsoft.Extensions.DependencyInjection.Abstractions": "[7.0.0, 8.0.0)",
1318+
"Microsoft.Extensions.DependencyInjection.Abstractions": "[6.0.0, 8.0.0)",
13161319
"Newtonsoft.Json": "[13.0.0, 14.0.0)"
13171320
}
13181321
}

‎version.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
3-
"version": "12.0.0-rc1",
3+
"version": "10.0.0-rc1",
44
"assemblyVersion": {
55
"precision": "build"
66
},

0 commit comments

Comments
 (0)