PT-14740: .net 8 (#391)

feat: Update to .NET 8
VirtoCommerce · Jan 11, 2024 · 626d2d8 · 626d2d8
1 parent a03079f
commit 626d2d8
Show file tree

Hide file tree

Showing 12 changed files with 72 additions and 72 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,12 +1,13 @@
-<?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.427.0</VersionPrefix>
-    <VersionSuffix></VersionSuffix>
+    <VersionPrefix>3.800.0</VersionPrefix>
+    <VersionSuffix>
+    </VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
   </PropertyGroup>
   <PropertyGroup>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
-</Project>
+</Project>
diff --git a/samples/VirtoCommerce.OrdersModule2.Web/VirtoCommerce.OrdersModule2.Web.csproj b/samples/VirtoCommerce.OrdersModule2.Web/VirtoCommerce.OrdersModule2.Web.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <OutputType>Library</OutputType>
   </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>

diff --git a/src/VirtoCommerce.OrdersModule.Core/VirtoCommerce.OrdersModule.Core.csproj b/src/VirtoCommerce.OrdersModule.Core/VirtoCommerce.OrdersModule.Core.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <noWarn>1591</noWarn>
     <IsPackable>True</IsPackable>
@@ -14,14 +14,14 @@
     <SonarQubeTestProject>false</SonarQubeTestProject>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-    <PackageReference Include="VirtoCommerce.CartModule.Core" Version="3.409.0" />
-    <PackageReference Include="VirtoCommerce.CoreModule.Core" Version="3.400.0" />
-    <PackageReference Include="VirtoCommerce.CustomerModule.Core" Version="3.400.0" />
-    <PackageReference Include="VirtoCommerce.NotificationsModule.Core" Version="3.400.0" />
-    <PackageReference Include="VirtoCommerce.PaymentModule.Core" Version="3.400.0" />
-    <PackageReference Include="VirtoCommerce.Platform.Core" Version="3.447.0" />
-    <PackageReference Include="VirtoCommerce.ShippingModule.Core" Version="3.400.0" />
-    <PackageReference Include="VirtoCommerce.StoreModule.Core" Version="3.400.0" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
+    <PackageReference Include="VirtoCommerce.CartModule.Core" Version="3.800.0" />
+    <PackageReference Include="VirtoCommerce.CoreModule.Core" Version="3.800.0" />
+    <PackageReference Include="VirtoCommerce.CustomerModule.Core" Version="3.800.0" />
+    <PackageReference Include="VirtoCommerce.NotificationsModule.Core" Version="3.800.0" />
+    <PackageReference Include="VirtoCommerce.PaymentModule.Core" Version="3.800.0" />
+    <PackageReference Include="VirtoCommerce.Platform.Core" Version="3.800.0" />
+    <PackageReference Include="VirtoCommerce.ShippingModule.Core" Version="3.800.0" />
+    <PackageReference Include="VirtoCommerce.StoreModule.Core" Version="3.800.0" />
   </ItemGroup>
 </Project>
diff --git a/src/VirtoCommerce.OrdersModule.Data.MySql/VirtoCommerce.OrdersModule.Data.MySql.csproj b/src/VirtoCommerce.OrdersModule.Data.MySql/VirtoCommerce.OrdersModule.Data.MySql.csproj
@@ -1,17 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <noWarn>NU5104</noWarn>
   </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.OrdersModule.Data\VirtoCommerce.OrdersModule.Data.csproj" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/...toCommerce.OrdersModule.Data.PostgreSql/VirtoCommerce.OrdersModule.Data.PostgreSql.csproj b/...toCommerce.OrdersModule.Data.PostgreSql/VirtoCommerce.OrdersModule.Data.PostgreSql.csproj
@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
   </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.OrdersModule.Data\VirtoCommerce.OrdersModule.Data.csproj" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/...irtoCommerce.OrdersModule.Data.SqlServer/VirtoCommerce.OrdersModule.Data.SqlServer.csproj b/...irtoCommerce.OrdersModule.Data.SqlServer/VirtoCommerce.OrdersModule.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.13" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\VirtoCommerce.OrdersModule.Data\VirtoCommerce.OrdersModule.Data.csproj" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/src/VirtoCommerce.OrdersModule.Data/VirtoCommerce.OrdersModule.Data.csproj b/src/VirtoCommerce.OrdersModule.Data/VirtoCommerce.OrdersModule.Data.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <noWarn>1591</noWarn>
     <IsPackable>True</IsPackable>
@@ -15,14 +15,14 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="AutoCompare.Core" Version="1.0.0" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-    <PackageReference Include="VirtoCommerce.CatalogModule.Core" Version="3.401.0" />
-    <PackageReference Include="VirtoCommerce.InventoryModule.Core" Version="3.402.0" />
-    <PackageReference Include="VirtoCommerce.Platform.Data" Version="3.447.0" />
-    <PackageReference Include="VirtoCommerce.Platform.Security" Version="3.447.0" />
-    <PackageReference Include="VirtoCommerce.SearchModule.Data" Version="3.402.0" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
+    <PackageReference Include="VirtoCommerce.CatalogModule.Core" Version="3.800.0" />
+    <PackageReference Include="VirtoCommerce.InventoryModule.Core" Version="3.800.0" />
+    <PackageReference Include="VirtoCommerce.Platform.Data" Version="3.800.0" />
+    <PackageReference Include="VirtoCommerce.Platform.Security" Version="3.800.0" />
+    <PackageReference Include="VirtoCommerce.SearchModule.Data" Version="3.800.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\VirtoCommerce.OrdersModule.Core\VirtoCommerce.OrdersModule.Core.csproj" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/src/VirtoCommerce.OrdersModule.Web/VirtoCommerce.OrdersModule.Web.csproj b/src/VirtoCommerce.OrdersModule.Web/VirtoCommerce.OrdersModule.Web.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <noWarn>1591</noWarn>
     <IsPackable>false</IsPackable>
@@ -23,8 +23,8 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="DinkToPdfCopy" Version="1.0.0" />
-    <PackageReference Include="VirtoCommerce.NotificationsModule.TemplateLoader.FileSystem" Version="3.400.0" />
-    <PackageReference Include="VirtoCommerce.PaymentModule.Data" Version="3.400.0" />
+    <PackageReference Include="VirtoCommerce.NotificationsModule.TemplateLoader.FileSystem" Version="3.800.0" />
+    <PackageReference Include="VirtoCommerce.PaymentModule.Data" Version="3.800.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\VirtoCommerce.OrdersModule.Core\VirtoCommerce.OrdersModule.Core.csproj" />

diff --git a/src/VirtoCommerce.OrdersModule.Web/module.manifest b/src/VirtoCommerce.OrdersModule.Web/module.manifest
@@ -1,23 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
   <id>VirtoCommerce.Orders</id>
-  <version>3.427.0</version>
+  <version>3.800.0</version>
   <version-tag />
-
-  <platformVersion>3.447.0</platformVersion>
+  <platformVersion>3.800.0</platformVersion>
   <dependencies>
-    <dependency id="VirtoCommerce.Cart" version="3.409.0" />
-    <dependency id="VirtoCommerce.Catalog" version="3.401.0" />
-    <dependency id="VirtoCommerce.Core" version="3.400.0" />
-    <dependency id="VirtoCommerce.Customer" version="3.400.0" />
-    <dependency id="VirtoCommerce.Inventory" version="3.402.0" />
-    <dependency id="VirtoCommerce.Notifications" version="3.400.0" />
-    <dependency id="VirtoCommerce.Payment" version="3.400.0" />
-    <dependency id="VirtoCommerce.Search" version="3.402.0" />
-    <dependency id="VirtoCommerce.Shipping" version="3.400.0" />
-    <dependency id="VirtoCommerce.Store" version="3.400.0" />
+    <dependency id="VirtoCommerce.Cart" version="3.800.0" />
+    <dependency id="VirtoCommerce.Catalog" version="3.800.0" />
+    <dependency id="VirtoCommerce.Core" version="3.800.0" />
+    <dependency id="VirtoCommerce.Customer" version="3.800.0" />
+    <dependency id="VirtoCommerce.Inventory" version="3.800.0" />
+    <dependency id="VirtoCommerce.Notifications" version="3.800.0" />
+    <dependency id="VirtoCommerce.Payment" version="3.800.0" />
+    <dependency id="VirtoCommerce.Search" version="3.800.0" />
+    <dependency id="VirtoCommerce.Shipping" version="3.800.0" />
+    <dependency id="VirtoCommerce.Store" version="3.800.0" />
   </dependencies>
-
   <title>Order Management</title>
   <description>Document based flexible order management system</description>
   <authors>
@@ -29,7 +27,7 @@
   <projectUrl>https://virtocommerce.com/apps/extensions/virto-orders-module</projectUrl>
   <iconUrl>Modules/$(VirtoCommerce.Orders)/Content/logo.png</iconUrl>
   <requireLicenseAcceptance>false</requireLicenseAcceptance>
-  <copyright>Copyright © 2011-2023 Virto Commerce. All rights reserved</copyright>
+  <copyright>Copyright © 2011-2024 Virto Commerce. All rights reserved</copyright>
   <tags>order system</tags>
   <assemblyFile>VirtoCommerce.OrdersModule.Web.dll</assemblyFile>
   <moduleType>VirtoCommerce.OrdersModule.Web.Module, VirtoCommerce.OrdersModule.Web</moduleType>

diff --git a/tests/VirtoCommerce.OrdersModule.Tests/CancelPaymentOrderTests.cs b/tests/VirtoCommerce.OrdersModule.Tests/CancelPaymentOrderTests.cs
@@ -47,7 +47,7 @@ public void GetJobArgumentsForChangedEntry_PaymentsCancelledStateChanged()
 
             // Assert
             result.Should().HaveCount(1);
-            result.First().PaymentId.Should().Equals(paymentId);
+            result.First().PaymentId.Should().Be(paymentId);
         }
 
 

diff --git a/tests/VirtoCommerce.OrdersModule.Tests/LogChangesOrderTests.cs b/tests/VirtoCommerce.OrdersModule.Tests/LogChangesOrderTests.cs
@@ -50,9 +50,9 @@ public void GetChangedEntryOperationLogsTest(CustomerOrder newOrder, CustomerOrd
 
             // Assert
             result.Should().HaveCount(1);
-            result.First().Id.Should().Equals(expectedResult.Id);
-            result.First().OperationType.Should().Equals(expectedResult.OperationType);
-            result.First().Detail.Should().Equals(expectedResult.Detail);
+            result.First().ObjectId.Should().Be(expectedResult.ObjectId);
+            result.First().OperationType.Should().Be(expectedResult.OperationType);
+            result.First().Detail.Should().Be(expectedResult.Detail);
         }
 
 
@@ -84,7 +84,7 @@ public void GetChangedEntryOperationLogsTest(CustomerOrder newOrder, CustomerOrd
                 EntryState.Added,
                 new OperationLog()
                 {
-                    Id = NewOrderTemplate.Id,
+                    ObjectId = NewOrderTemplate.Id,
                     ObjectType = nameof(CustomerOrder),
                     OperationType = EntryState.Added,
                     Detail = $"The new CustomerOrder {NewOrderTemplate.Number} added",
@@ -102,7 +102,7 @@ public void GetChangedEntryOperationLogsTest(CustomerOrder newOrder, CustomerOrd
                 EntryState.Deleted,
                 new OperationLog()
                 {
-                    Id = NewOrderTemplate.Id,
+                    ObjectId = NewOrderTemplate.Id,
                     ObjectType = nameof(CustomerOrder),
                     OperationType = EntryState.Deleted,
                     Detail = $"The CustomerOrder {NewOrderTemplate.Number} deleted",
@@ -124,7 +124,7 @@ public void GetChangedEntryOperationLogsTest(CustomerOrder newOrder, CustomerOrd
                 EntryState.Modified,
                 new OperationLog()
                 {
-                    Id = NewOrderTemplate.Id,
+                    ObjectId = NewOrderTemplate.Id,
                     ObjectType = nameof(CustomerOrder),
                     OperationType = EntryState.Modified,
                     Detail = $"Order employee was changed to '{NewOrderTemplate.EmployeeId}'",
@@ -146,7 +146,7 @@ public void GetChangedEntryOperationLogsTest(CustomerOrder newOrder, CustomerOrd
                 EntryState.Modified,
                 new OperationLog()
                 {
-                    Id = NewOrderTemplate.Id,
+                    ObjectId = NewOrderTemplate.Id,
                     ObjectType = nameof(CustomerOrder),
                     OperationType = EntryState.Modified,
                     Detail = $"The CustomerOrder {NewOrderTemplate.Number} property 'Number' changed from '{OldOrderTemplate.Number}' to '{NewOrderTemplate.Number}'",

diff --git a/tests/VirtoCommerce.OrdersModule.Tests/VirtoCommerce.OrdersModule.Tests.csproj b/tests/VirtoCommerce.OrdersModule.Tests/VirtoCommerce.OrdersModule.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <noWarn>1591</noWarn>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
@@ -9,17 +9,17 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="FluentAssertions" Version="5.10.3" />
-    <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="FluentAssertions" Version="6.12.0" />
+    <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">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>