diff --git a/Directory.Build.props b/Directory.Build.props index 56d94b88..e2fe5d6f 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,12 +1,13 @@ - + - 3.427.0 - + 3.800.0 + + $(VersionSuffix)-$(BuildNumber) true - + \ No newline at end of file diff --git a/samples/VirtoCommerce.OrdersModule2.Web/VirtoCommerce.OrdersModule2.Web.csproj b/samples/VirtoCommerce.OrdersModule2.Web/VirtoCommerce.OrdersModule2.Web.csproj index e40088aa..e2d7c766 100644 --- a/samples/VirtoCommerce.OrdersModule2.Web/VirtoCommerce.OrdersModule2.Web.csproj +++ b/samples/VirtoCommerce.OrdersModule2.Web/VirtoCommerce.OrdersModule2.Web.csproj @@ -1,11 +1,11 @@ - net6.0 + net8.0 false Library - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/VirtoCommerce.OrdersModule.Core/VirtoCommerce.OrdersModule.Core.csproj b/src/VirtoCommerce.OrdersModule.Core/VirtoCommerce.OrdersModule.Core.csproj index b6e1ba10..ff4bc2c6 100644 --- a/src/VirtoCommerce.OrdersModule.Core/VirtoCommerce.OrdersModule.Core.csproj +++ b/src/VirtoCommerce.OrdersModule.Core/VirtoCommerce.OrdersModule.Core.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0 true 1591 True @@ -14,14 +14,14 @@ false - - - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/src/VirtoCommerce.OrdersModule.Data.MySql/VirtoCommerce.OrdersModule.Data.MySql.csproj b/src/VirtoCommerce.OrdersModule.Data.MySql/VirtoCommerce.OrdersModule.Data.MySql.csproj index ca0bd67b..c4249b3b 100644 --- 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 @@ - net6.0 + net8.0 enable enable + NU5104 - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + - + \ No newline at end of file diff --git a/src/VirtoCommerce.OrdersModule.Data.PostgreSql/VirtoCommerce.OrdersModule.Data.PostgreSql.csproj b/src/VirtoCommerce.OrdersModule.Data.PostgreSql/VirtoCommerce.OrdersModule.Data.PostgreSql.csproj index da4c4e96..18d37a35 100644 --- a/src/VirtoCommerce.OrdersModule.Data.PostgreSql/VirtoCommerce.OrdersModule.Data.PostgreSql.csproj +++ b/src/VirtoCommerce.OrdersModule.Data.PostgreSql/VirtoCommerce.OrdersModule.Data.PostgreSql.csproj @@ -1,17 +1,17 @@ - net6.0 + net8.0 enable - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + - + \ No newline at end of file diff --git a/src/VirtoCommerce.OrdersModule.Data.SqlServer/VirtoCommerce.OrdersModule.Data.SqlServer.csproj b/src/VirtoCommerce.OrdersModule.Data.SqlServer/VirtoCommerce.OrdersModule.Data.SqlServer.csproj index 8d1d8d15..8adc6a2c 100644 --- a/src/VirtoCommerce.OrdersModule.Data.SqlServer/VirtoCommerce.OrdersModule.Data.SqlServer.csproj +++ b/src/VirtoCommerce.OrdersModule.Data.SqlServer/VirtoCommerce.OrdersModule.Data.SqlServer.csproj @@ -1,17 +1,17 @@ - net6.0 + net8.0 enable enable - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + - + \ No newline at end of file diff --git a/src/VirtoCommerce.OrdersModule.Data/VirtoCommerce.OrdersModule.Data.csproj b/src/VirtoCommerce.OrdersModule.Data/VirtoCommerce.OrdersModule.Data.csproj index 888d55a6..08dd836e 100644 --- a/src/VirtoCommerce.OrdersModule.Data/VirtoCommerce.OrdersModule.Data.csproj +++ b/src/VirtoCommerce.OrdersModule.Data/VirtoCommerce.OrdersModule.Data.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0 true 1591 True @@ -15,14 +15,14 @@ - - - - - - + + + + + + - + \ No newline at end of file diff --git a/src/VirtoCommerce.OrdersModule.Web/VirtoCommerce.OrdersModule.Web.csproj b/src/VirtoCommerce.OrdersModule.Web/VirtoCommerce.OrdersModule.Web.csproj index 2e50d2a3..90c06514 100644 --- a/src/VirtoCommerce.OrdersModule.Web/VirtoCommerce.OrdersModule.Web.csproj +++ b/src/VirtoCommerce.OrdersModule.Web/VirtoCommerce.OrdersModule.Web.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0 true 1591 false @@ -23,8 +23,8 @@ - - + + diff --git a/src/VirtoCommerce.OrdersModule.Web/module.manifest b/src/VirtoCommerce.OrdersModule.Web/module.manifest index 6f73e2bf..93601620 100644 --- a/src/VirtoCommerce.OrdersModule.Web/module.manifest +++ b/src/VirtoCommerce.OrdersModule.Web/module.manifest @@ -1,23 +1,21 @@ VirtoCommerce.Orders - 3.427.0 + 3.800.0 - - 3.447.0 + 3.800.0 - - - - - - - - - - + + + + + + + + + + - Order Management Document based flexible order management system @@ -29,7 +27,7 @@ https://virtocommerce.com/apps/extensions/virto-orders-module Modules/$(VirtoCommerce.Orders)/Content/logo.png false - Copyright © 2011-2023 Virto Commerce. All rights reserved + Copyright © 2011-2024 Virto Commerce. All rights reserved order system VirtoCommerce.OrdersModule.Web.dll VirtoCommerce.OrdersModule.Web.Module, VirtoCommerce.OrdersModule.Web diff --git a/tests/VirtoCommerce.OrdersModule.Tests/CancelPaymentOrderTests.cs b/tests/VirtoCommerce.OrdersModule.Tests/CancelPaymentOrderTests.cs index a57be3a6..c3c13c43 100644 --- 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 index 43887182..2752e4eb 100644 --- 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 index 444b1581..87d44f09 100644 --- a/tests/VirtoCommerce.OrdersModule.Tests/VirtoCommerce.OrdersModule.Tests.csproj +++ b/tests/VirtoCommerce.OrdersModule.Tests/VirtoCommerce.OrdersModule.Tests.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0 1591 false @@ -9,17 +9,17 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - - - - - - - + + + + + + + all runtime; build; native; contentfiles; analyzers - + all runtime; build; native; contentfiles; analyzers