From 77e3d343e89f63293c1eac1d905102df21c5ae0d Mon Sep 17 00:00:00 2001
From: Basil Kotov <basilkot@gmail.com>
Date: Thu, 11 Jan 2024 03:50:45 -0800
Subject: [PATCH] PT-14740: Update to .net 8 (#220)

feat: Update to .NET 8
---
 .nuke                                          |  1 -
 .nuke/parameters.json                          |  4 ++++
 Directory.Build.props                          |  6 +++---
 .../VirtoCommerce.CoreModule.Core.csproj       |  8 ++++----
 .../VirtoCommerce.CoreModule.Data.MySql.csproj |  8 ++++----
 ...oCommerce.CoreModule.Data.PostgreSql.csproj | 10 +++++-----
 .../20210728124419_roundingpolicy.Designer.cs  |  2 +-
 .../20210728124419_roundingpolicy.cs           |  2 +-
 ...toCommerce.CoreModule.Data.SqlServer.csproj |  8 ++++----
 .../Repositories/CoreDbContext.cs              |  3 ++-
 .../VirtoCommerce.CoreModule.Data.csproj       | 10 +++++-----
 .../VirtoCommerce.CoreModule.Web.csproj        |  2 +-
 .../module.manifest                            |  6 +++---
 .../VirtoCommerce.Tools.csproj                 |  4 ++--
 .../VirtoCommerce.CoreModule.Tests.csproj      | 18 +++++++++---------
 .../VirtoCommerce.Tools.Tests.csproj           | 18 +++++++++---------
 16 files changed, 57 insertions(+), 53 deletions(-)
 delete mode 100644 .nuke
 create mode 100644 .nuke/parameters.json

diff --git a/.nuke b/.nuke
deleted file mode 100644
index 90d8ca9ee..000000000
--- a/.nuke
+++ /dev/null
@@ -1 +0,0 @@
-VirtoCommerce.CoreModule.sln
diff --git a/.nuke/parameters.json b/.nuke/parameters.json
new file mode 100644
index 000000000..b602ff643
--- /dev/null
+++ b/.nuke/parameters.json
@@ -0,0 +1,4 @@
+{
+  "$schema": "./build.schema.json",
+  "Solution": "VirtoCommerce.CoreModule.sln"
+}
\ No newline at end of file
diff --git a/Directory.Build.props b/Directory.Build.props
index 74eeb7f7b..e2fe5d6fa 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project>
   <!-- These properties will be shared for all projects -->
   <PropertyGroup>
-    <VersionPrefix>3.405.0</VersionPrefix>
+    <VersionPrefix>3.800.0</VersionPrefix>
     <VersionSuffix>
     </VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
@@ -10,4 +10,4 @@
   <PropertyGroup>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/VirtoCommerce.CoreModule.Core/VirtoCommerce.CoreModule.Core.csproj b/src/VirtoCommerce.CoreModule.Core/VirtoCommerce.CoreModule.Core.csproj
index eb75f87d0..3582409df 100644
--- a/src/VirtoCommerce.CoreModule.Core/VirtoCommerce.CoreModule.Core.csproj
+++ b/src/VirtoCommerce.CoreModule.Core/VirtoCommerce.CoreModule.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Description>Common the e-commerce domain functionality</Description>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <noWarn>1591</noWarn>
     <IsPackable>True</IsPackable>
@@ -11,8 +11,8 @@
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-    <PackageReference Include="TimeZoneConverter" Version="3.2.0" />
-    <PackageReference Include="VirtoCommerce.Platform.Core" Version="3.429.0" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
+    <PackageReference Include="TimeZoneConverter" Version="6.1.0" />
+    <PackageReference Include="VirtoCommerce.Platform.Core" Version="3.800.0" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/VirtoCommerce.CoreModule.Data.MySql/VirtoCommerce.CoreModule.Data.MySql.csproj b/src/VirtoCommerce.CoreModule.Data.MySql/VirtoCommerce.CoreModule.Data.MySql.csproj
index 660b81838..14f6179e8 100644
--- a/src/VirtoCommerce.CoreModule.Data.MySql/VirtoCommerce.CoreModule.Data.MySql.csproj
+++ b/src/VirtoCommerce.CoreModule.Data.MySql/VirtoCommerce.CoreModule.Data.MySql.csproj
@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.13">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.0" />
+    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.0-beta.2" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\VirtoCommerce.CoreModule.Data\VirtoCommerce.CoreModule.Data.csproj" />
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/VirtoCommerce.CoreModule.Data.PostgreSql/VirtoCommerce.CoreModule.Data.PostgreSql.csproj b/src/VirtoCommerce.CoreModule.Data.PostgreSql/VirtoCommerce.CoreModule.Data.PostgreSql.csproj
index 4339dfb0e..7e6c1d584 100644
--- a/src/VirtoCommerce.CoreModule.Data.PostgreSql/VirtoCommerce.CoreModule.Data.PostgreSql.csproj
+++ b/src/VirtoCommerce.CoreModule.Data.PostgreSql/VirtoCommerce.CoreModule.Data.PostgreSql.csproj
@@ -1,18 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.13">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Npgsql" Version="6.0.0" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.0" />
+    <PackageReference Include="Npgsql" Version="8.0.1" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\VirtoCommerce.CoreModule.Data\VirtoCommerce.CoreModule.Data.csproj" />
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/VirtoCommerce.CoreModule.Data.SqlServer/Migrations/20210728124419_roundingpolicy.Designer.cs b/src/VirtoCommerce.CoreModule.Data.SqlServer/Migrations/20210728124419_roundingpolicy.Designer.cs
index 3cd3528c3..0aaf2d013 100644
--- a/src/VirtoCommerce.CoreModule.Data.SqlServer/Migrations/20210728124419_roundingpolicy.Designer.cs
+++ b/src/VirtoCommerce.CoreModule.Data.SqlServer/Migrations/20210728124419_roundingpolicy.Designer.cs
@@ -11,7 +11,7 @@ namespace VirtoCommerce.CoreModule.Data.SqlServer.Migrations
 {
     [DbContext(typeof(CoreDbContext))]
     [Migration("20210728124419_roundingpolicy")]
-    partial class roundingpolicy
+    partial class RoundingPolicy
     {
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
         {
diff --git a/src/VirtoCommerce.CoreModule.Data.SqlServer/Migrations/20210728124419_roundingpolicy.cs b/src/VirtoCommerce.CoreModule.Data.SqlServer/Migrations/20210728124419_roundingpolicy.cs
index 2c6f60027..1e601a283 100644
--- a/src/VirtoCommerce.CoreModule.Data.SqlServer/Migrations/20210728124419_roundingpolicy.cs
+++ b/src/VirtoCommerce.CoreModule.Data.SqlServer/Migrations/20210728124419_roundingpolicy.cs
@@ -2,7 +2,7 @@
 
 namespace VirtoCommerce.CoreModule.Data.SqlServer.Migrations
 {
-    public partial class roundingpolicy : Migration
+    public partial class RoundingPolicy : Migration
     {
         protected override void Up(MigrationBuilder migrationBuilder)
         {
diff --git a/src/VirtoCommerce.CoreModule.Data.SqlServer/VirtoCommerce.CoreModule.Data.SqlServer.csproj b/src/VirtoCommerce.CoreModule.Data.SqlServer/VirtoCommerce.CoreModule.Data.SqlServer.csproj
index 092a41511..8347ebce9 100644
--- a/src/VirtoCommerce.CoreModule.Data.SqlServer/VirtoCommerce.CoreModule.Data.SqlServer.csproj
+++ b/src/VirtoCommerce.CoreModule.Data.SqlServer/VirtoCommerce.CoreModule.Data.SqlServer.csproj
@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.13">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\VirtoCommerce.CoreModule.Data\VirtoCommerce.CoreModule.Data.csproj" />
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/VirtoCommerce.CoreModule.Data/Repositories/CoreDbContext.cs b/src/VirtoCommerce.CoreModule.Data/Repositories/CoreDbContext.cs
index 5d8822e3c..20af0e535 100644
--- a/src/VirtoCommerce.CoreModule.Data/Repositories/CoreDbContext.cs
+++ b/src/VirtoCommerce.CoreModule.Data/Repositories/CoreDbContext.cs
@@ -5,11 +5,12 @@
 using VirtoCommerce.CoreModule.Data.Currency;
 using VirtoCommerce.CoreModule.Data.Model;
 using VirtoCommerce.CoreModule.Data.Package;
+using VirtoCommerce.Platform.Data.Infrastructure;
 
 namespace VirtoCommerce.CoreModule.Data.Repositories
 {
 #pragma warning disable S109
-    public class CoreDbContext : DbContextWithTriggers
+    public class CoreDbContext : DbContextBase
     {
         public CoreDbContext(DbContextOptions<CoreDbContext> options)
             : base(options)
diff --git a/src/VirtoCommerce.CoreModule.Data/VirtoCommerce.CoreModule.Data.csproj b/src/VirtoCommerce.CoreModule.Data/VirtoCommerce.CoreModule.Data.csproj
index 7486a0985..11fbc8a2a 100644
--- a/src/VirtoCommerce.CoreModule.Data/VirtoCommerce.CoreModule.Data.csproj
+++ b/src/VirtoCommerce.CoreModule.Data/VirtoCommerce.CoreModule.Data.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <noWarn>1591</noWarn>
     <Description>Common the e-commerce domain functionality</Description>
     <IsPackable>True</IsPackable>
@@ -10,10 +10,10 @@
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-    <PackageReference Include="Serialize.Linq" Version="1.8.1" />
-    <PackageReference Include="VirtoCommerce.Platform.Data" Version="3.429.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.0" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
+    <PackageReference Include="Serialize.Linq" Version="3.0.148" />
+    <PackageReference Include="VirtoCommerce.Platform.Data" Version="3.800.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\VirtoCommerce.CoreModule.Core\VirtoCommerce.CoreModule.Core.csproj" />
diff --git a/src/VirtoCommerce.CoreModule.Web/VirtoCommerce.CoreModule.Web.csproj b/src/VirtoCommerce.CoreModule.Web/VirtoCommerce.CoreModule.Web.csproj
index ed900d8c0..e35ec7956 100644
--- a/src/VirtoCommerce.CoreModule.Web/VirtoCommerce.CoreModule.Web.csproj
+++ b/src/VirtoCommerce.CoreModule.Web/VirtoCommerce.CoreModule.Web.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <!--<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>-->
     <IsPackable>False</IsPackable>
diff --git a/src/VirtoCommerce.CoreModule.Web/module.manifest b/src/VirtoCommerce.CoreModule.Web/module.manifest
index 9b7fc96de..fc3f1bdcf 100644
--- a/src/VirtoCommerce.CoreModule.Web/module.manifest
+++ b/src/VirtoCommerce.CoreModule.Web/module.manifest
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <id>VirtoCommerce.Core</id>
-  <version>3.405.0</version>
+  <version>3.800.0</version>
   <version-tag />
-  <platformVersion>3.429.0</platformVersion>
+  <platformVersion>3.800.0</platformVersion>
   <title>Commerce core module</title>
   <description>Common e-commerce domain functionality</description>
   <authors>
@@ -17,7 +17,7 @@
   <iconUrl>Modules/$(VirtoCommerce.Core)/Content/logoVC.png</iconUrl>
   <requireLicenseAcceptance>false</requireLicenseAcceptance>
   <releaseNotes />
-  <copyright>Copyright © 2011-2023 Virto Commerce. All rights reserved</copyright>
+  <copyright>Copyright © 2011-2024 Virto Commerce. All rights reserved</copyright>
   <tags>security core</tags>
   <assemblyFile>VirtoCommerce.CoreModule.Web.dll</assemblyFile>
   <moduleType>VirtoCommerce.CoreModule.Web.Module, VirtoCommerce.CoreModule.Web</moduleType>
diff --git a/src/VirtoCommerce.Tools/VirtoCommerce.Tools.csproj b/src/VirtoCommerce.Tools/VirtoCommerce.Tools.csproj
index 765885fbe..af788023c 100644
--- a/src/VirtoCommerce.Tools/VirtoCommerce.Tools.csproj
+++ b/src/VirtoCommerce.Tools/VirtoCommerce.Tools.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <noWarn>1591</noWarn>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
@@ -8,6 +8,6 @@
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/VirtoCommerce.CoreModule.Tests/VirtoCommerce.CoreModule.Tests.csproj b/tests/VirtoCommerce.CoreModule.Tests/VirtoCommerce.CoreModule.Tests.csproj
index 2f58c853e..cef1210e9 100644
--- a/tests/VirtoCommerce.CoreModule.Tests/VirtoCommerce.CoreModule.Tests.csproj
+++ b/tests/VirtoCommerce.CoreModule.Tests/VirtoCommerce.CoreModule.Tests.csproj
@@ -1,20 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <noWarn>1591</noWarn>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="3.2.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="Moq" Version="4.13.1" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.1.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.1.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.console" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="Moq" Version="4.20.70" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
+    <PackageReference Include="xunit" Version="2.6.2" />
+    <PackageReference Include="xunit.runner.console" Version="2.6.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.4" />
     <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
   </ItemGroup>
   <ItemGroup>
diff --git a/tests/VirtoCommerce.Tools.Tests/VirtoCommerce.Tools.Tests.csproj b/tests/VirtoCommerce.Tools.Tests/VirtoCommerce.Tools.Tests.csproj
index dd8634869..d85bb7fdc 100644
--- a/tests/VirtoCommerce.Tools.Tests/VirtoCommerce.Tools.Tests.csproj
+++ b/tests/VirtoCommerce.Tools.Tests/VirtoCommerce.Tools.Tests.csproj
@@ -1,20 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <noWarn>1591</noWarn>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="3.2.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="Moq" Version="4.13.1" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.1.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.1.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.console" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="Moq" Version="4.20.70" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
+    <PackageReference Include="xunit" Version="2.6.2" />
+    <PackageReference Include="xunit.runner.console" Version="2.6.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.4" />
     <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
   </ItemGroup>
   <ItemGroup>