From b9080ba6792af11b6b8be448356eaea05b4bd5b8 Mon Sep 17 00:00:00 2001 From: Basil Kotov Date: Tue, 12 Dec 2023 09:14:59 +0000 Subject: [PATCH 1/3] .net 8 --- Directory.Build.props | 9 +++---- .../VirtoCommerce.ReturnModule.Core.csproj | 11 ++++----- ...rtoCommerce.ReturnModule.Data.MySql.csproj | 17 ++++++------- ...mmerce.ReturnModule.Data.PostgreSql.csproj | 19 +++++++-------- ...ommerce.ReturnModule.Data.SqlServer.csproj | 17 ++++++------- .../Services/ReturnService.cs | 2 +- .../VirtoCommerce.ReturnModule.Data.csproj | 12 +++++----- .../VirtoCommerce.ReturnModule.Web.csproj | 4 ++-- .../module.manifest | 12 +++++----- .../package-lock.json | 24 +++++++++++++------ .../VirtoCommerce.ReturnModule.Tests.csproj | 10 ++++---- 11 files changed, 69 insertions(+), 68 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 0091313..e2fe5d6 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,12 +1,13 @@ - + - 3.403.0 - + 3.800.0 + + $(VersionSuffix)-$(BuildNumber) true - + \ No newline at end of file diff --git a/src/VirtoCommerce.ReturnModule.Core/VirtoCommerce.ReturnModule.Core.csproj b/src/VirtoCommerce.ReturnModule.Core/VirtoCommerce.ReturnModule.Core.csproj index 976f7e9..eb0ab12 100644 --- a/src/VirtoCommerce.ReturnModule.Core/VirtoCommerce.ReturnModule.Core.csproj +++ b/src/VirtoCommerce.ReturnModule.Core/VirtoCommerce.ReturnModule.Core.csproj @@ -1,15 +1,14 @@ - net6.0 + net8.0 false - - - + + + - - + \ No newline at end of file diff --git a/src/VirtoCommerce.ReturnModule.Data.MySql/VirtoCommerce.ReturnModule.Data.MySql.csproj b/src/VirtoCommerce.ReturnModule.Data.MySql/VirtoCommerce.ReturnModule.Data.MySql.csproj index da01abb..7eeb8fd 100644 --- a/src/VirtoCommerce.ReturnModule.Data.MySql/VirtoCommerce.ReturnModule.Data.MySql.csproj +++ b/src/VirtoCommerce.ReturnModule.Data.MySql/VirtoCommerce.ReturnModule.Data.MySql.csproj @@ -1,18 +1,15 @@ - - net6.0 + net8.0 enable enable - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + - - + \ No newline at end of file diff --git a/src/VirtoCommerce.ReturnModule.Data.PostgreSql/VirtoCommerce.ReturnModule.Data.PostgreSql.csproj b/src/VirtoCommerce.ReturnModule.Data.PostgreSql/VirtoCommerce.ReturnModule.Data.PostgreSql.csproj index 3ef0c2f..d7ea643 100644 --- a/src/VirtoCommerce.ReturnModule.Data.PostgreSql/VirtoCommerce.ReturnModule.Data.PostgreSql.csproj +++ b/src/VirtoCommerce.ReturnModule.Data.PostgreSql/VirtoCommerce.ReturnModule.Data.PostgreSql.csproj @@ -1,19 +1,16 @@ - - net6.0 + net8.0 enable enable - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + - - + \ No newline at end of file diff --git a/src/VirtoCommerce.ReturnModule.Data.SqlServer/VirtoCommerce.ReturnModule.Data.SqlServer.csproj b/src/VirtoCommerce.ReturnModule.Data.SqlServer/VirtoCommerce.ReturnModule.Data.SqlServer.csproj index 454293c..1683a5e 100644 --- a/src/VirtoCommerce.ReturnModule.Data.SqlServer/VirtoCommerce.ReturnModule.Data.SqlServer.csproj +++ b/src/VirtoCommerce.ReturnModule.Data.SqlServer/VirtoCommerce.ReturnModule.Data.SqlServer.csproj @@ -1,18 +1,15 @@ - - net6.0 + net8.0 enable enable - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + - - + \ No newline at end of file diff --git a/src/VirtoCommerce.ReturnModule.Data/Services/ReturnService.cs b/src/VirtoCommerce.ReturnModule.Data/Services/ReturnService.cs index 44251d5..f938488 100644 --- a/src/VirtoCommerce.ReturnModule.Data/Services/ReturnService.cs +++ b/src/VirtoCommerce.ReturnModule.Data/Services/ReturnService.cs @@ -133,7 +133,7 @@ private async Task EnsureEachReturnHasNumber(IEnumerable returns) if (ordersById.TryGetValue(orderReturn.OrderId, out var order) && storesById.TryGetValue(order.StoreId, out var store)) { - numberTemplate = store.Settings.GetSettingValue(settingDescriptor.Name, numberTemplate); + numberTemplate = store.Settings.GetValue(settingDescriptor); } orderReturn.Number = _uniqueNumberGenerator.GenerateNumber(numberTemplate); diff --git a/src/VirtoCommerce.ReturnModule.Data/VirtoCommerce.ReturnModule.Data.csproj b/src/VirtoCommerce.ReturnModule.Data/VirtoCommerce.ReturnModule.Data.csproj index e8002cf..4463f14 100644 --- a/src/VirtoCommerce.ReturnModule.Data/VirtoCommerce.ReturnModule.Data.csproj +++ b/src/VirtoCommerce.ReturnModule.Data/VirtoCommerce.ReturnModule.Data.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0 @@ -10,12 +10,12 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all - - - + + + - + \ No newline at end of file diff --git a/src/VirtoCommerce.ReturnModule.Web/VirtoCommerce.ReturnModule.Web.csproj b/src/VirtoCommerce.ReturnModule.Web/VirtoCommerce.ReturnModule.Web.csproj index 6a0f4ca..7ffccd9 100644 --- a/src/VirtoCommerce.ReturnModule.Web/VirtoCommerce.ReturnModule.Web.csproj +++ b/src/VirtoCommerce.ReturnModule.Web/VirtoCommerce.ReturnModule.Web.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0 Library @@ -14,4 +14,4 @@ - + \ No newline at end of file diff --git a/src/VirtoCommerce.ReturnModule.Web/module.manifest b/src/VirtoCommerce.ReturnModule.Web/module.manifest index 1dbb6ad..9252cf9 100644 --- a/src/VirtoCommerce.ReturnModule.Web/module.manifest +++ b/src/VirtoCommerce.ReturnModule.Web/module.manifest @@ -1,12 +1,12 @@ - + VirtoCommerce.Return - 3.403.0 + 3.800.0 - 3.400.0 + 3.800.0-alpha.12831-net8 - - + + Return module Return module @@ -19,7 +19,7 @@ false First version. - Copyright © 2022–2023 VirtoCommerce. All rights reserved + Copyright © 2011-2024 Virto Commerce. All rights reserved extension module VirtoCommerce.ReturnModule.Web.dll VirtoCommerce.ReturnModule.Web.Module, VirtoCommerce.ReturnModule.Web diff --git a/src/VirtoCommerce.ReturnModule.Web/package-lock.json b/src/VirtoCommerce.ReturnModule.Web/package-lock.json index d52b982..11a8e51 100644 --- a/src/VirtoCommerce.ReturnModule.Web/package-lock.json +++ b/src/VirtoCommerce.ReturnModule.Web/package-lock.json @@ -1089,10 +1089,16 @@ } }, "node_modules/nanoid": { - "version": "3.3.4", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz", - "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==", + "version": "3.3.7", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", + "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], "bin": { "nanoid": "bin/nanoid.cjs" }, @@ -1263,9 +1269,9 @@ } }, "node_modules/postcss": { - "version": "8.4.21", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz", - "integrity": "sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==", + "version": "8.4.32", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.32.tgz", + "integrity": "sha512-D/kj5JNu6oo2EIy+XL/26JEDTlIbB8hw85G8StOE6L74RQAVVP5rej6wxCNqyMbR4RkPfqvezVbPw81Ngd6Kcw==", "dev": true, "funding": [ { @@ -1275,10 +1281,14 @@ { "type": "tidelift", "url": "https://tidelift.com/funding/github/npm/postcss" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" } ], "dependencies": { - "nanoid": "^3.3.4", + "nanoid": "^3.3.7", "picocolors": "^1.0.0", "source-map-js": "^1.0.2" }, diff --git a/tests/VirtoCommerce.ReturnModule.Tests/VirtoCommerce.ReturnModule.Tests.csproj b/tests/VirtoCommerce.ReturnModule.Tests/VirtoCommerce.ReturnModule.Tests.csproj index 15023b3..f98ece4 100644 --- a/tests/VirtoCommerce.ReturnModule.Tests/VirtoCommerce.ReturnModule.Tests.csproj +++ b/tests/VirtoCommerce.ReturnModule.Tests/VirtoCommerce.ReturnModule.Tests.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0 false @@ -12,13 +12,13 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - - - + + + - + \ No newline at end of file From 080a1d0292b85c03d3e3f19cab785342fc8c9f84 Mon Sep 17 00:00:00 2001 From: Basil Kotov Date: Wed, 13 Dec 2023 10:04:39 +0000 Subject: [PATCH 2/3] derive DbContext from DbContextBase --- .../Repositories/ReturnDbContext.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/VirtoCommerce.ReturnModule.Data/Repositories/ReturnDbContext.cs b/src/VirtoCommerce.ReturnModule.Data/Repositories/ReturnDbContext.cs index 063205c..23d3f48 100644 --- a/src/VirtoCommerce.ReturnModule.Data/Repositories/ReturnDbContext.cs +++ b/src/VirtoCommerce.ReturnModule.Data/Repositories/ReturnDbContext.cs @@ -2,10 +2,11 @@ using EntityFrameworkCore.Triggers; using Microsoft.EntityFrameworkCore; using VirtoCommerce.ReturnModule.Data.Models; +using VirtoCommerce.Platform.Data.Infrastructure; namespace VirtoCommerce.ReturnModule.Data.Repositories { - public class ReturnDbContext : DbContextWithTriggers + public class ReturnDbContext : DbContextBase { public ReturnDbContext(DbContextOptions options) : base(options) From 11a3294b7653156d881bbde2da1855dafcd283d8 Mon Sep 17 00:00:00 2001 From: Basil Kotov Date: Fri, 12 Jan 2024 08:25:29 +0000 Subject: [PATCH 3/3] update to 3.800 --- Directory.Build.props | 5 ++--- .../VirtoCommerce.ReturnModule.Core.csproj | 4 ++-- .../VirtoCommerce.ReturnModule.Data.MySql.csproj | 1 + .../VirtoCommerce.ReturnModule.Data.csproj | 4 ++-- src/VirtoCommerce.ReturnModule.Web/module.manifest | 12 +++++++----- 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index e2fe5d6..46bd0f8 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,10 +1,9 @@ - + 3.800.0 - - + $(VersionSuffix)-$(BuildNumber) diff --git a/src/VirtoCommerce.ReturnModule.Core/VirtoCommerce.ReturnModule.Core.csproj b/src/VirtoCommerce.ReturnModule.Core/VirtoCommerce.ReturnModule.Core.csproj index eb0ab12..2aaa1da 100644 --- a/src/VirtoCommerce.ReturnModule.Core/VirtoCommerce.ReturnModule.Core.csproj +++ b/src/VirtoCommerce.ReturnModule.Core/VirtoCommerce.ReturnModule.Core.csproj @@ -8,7 +8,7 @@ - - + + \ No newline at end of file diff --git a/src/VirtoCommerce.ReturnModule.Data.MySql/VirtoCommerce.ReturnModule.Data.MySql.csproj b/src/VirtoCommerce.ReturnModule.Data.MySql/VirtoCommerce.ReturnModule.Data.MySql.csproj index 7eeb8fd..dd2117e 100644 --- a/src/VirtoCommerce.ReturnModule.Data.MySql/VirtoCommerce.ReturnModule.Data.MySql.csproj +++ b/src/VirtoCommerce.ReturnModule.Data.MySql/VirtoCommerce.ReturnModule.Data.MySql.csproj @@ -3,6 +3,7 @@ net8.0 enable enable + NU5104 diff --git a/src/VirtoCommerce.ReturnModule.Data/VirtoCommerce.ReturnModule.Data.csproj b/src/VirtoCommerce.ReturnModule.Data/VirtoCommerce.ReturnModule.Data.csproj index 4463f14..0a955bc 100644 --- a/src/VirtoCommerce.ReturnModule.Data/VirtoCommerce.ReturnModule.Data.csproj +++ b/src/VirtoCommerce.ReturnModule.Data/VirtoCommerce.ReturnModule.Data.csproj @@ -15,7 +15,7 @@ all - - + + \ No newline at end of file diff --git a/src/VirtoCommerce.ReturnModule.Web/module.manifest b/src/VirtoCommerce.ReturnModule.Web/module.manifest index 9252cf9..644c6ca 100644 --- a/src/VirtoCommerce.ReturnModule.Web/module.manifest +++ b/src/VirtoCommerce.ReturnModule.Web/module.manifest @@ -1,13 +1,15 @@ - + VirtoCommerce.Return 3.800.0 - 3.800.0-alpha.12831-net8 + + 3.800.0 - - + + + Return module Return module @@ -24,4 +26,4 @@ VirtoCommerce.ReturnModule.Web.dll VirtoCommerce.ReturnModule.Web.Module, VirtoCommerce.ReturnModule.Web false - \ No newline at end of file +