diff --git a/Directory.Packages.props b/Directory.Packages.props index b2786b10f..f22ad1651 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -4,78 +4,78 @@ - - - - - - - + + + + + + - - - - + + + + - - + + - - + + - - - - - - - + + + + + + + - + - - - - - - + + + + + + + - + - + - + - - + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - + + \ No newline at end of file diff --git a/src/Business/Grand.Business.Common/Grand.Business.Common.csproj b/src/Business/Grand.Business.Common/Grand.Business.Common.csproj index 80d38409c..0e1569a1c 100644 --- a/src/Business/Grand.Business.Common/Grand.Business.Common.csproj +++ b/src/Business/Grand.Business.Common/Grand.Business.Common.csproj @@ -1,11 +1,11 @@  - - + + diff --git a/src/Business/Grand.Business.Common/Utilities/PowerExcelExtensions.cs b/src/Business/Grand.Business.Common/Utilities/PowerExcelExtensions.cs index 60036e3ec..efd1757ba 100644 --- a/src/Business/Grand.Business.Common/Utilities/PowerExcelExtensions.cs +++ b/src/Business/Grand.Business.Common/Utilities/PowerExcelExtensions.cs @@ -7,6 +7,7 @@ namespace Grand.Business.Common.Utilities; internal static class PowerExcelExtensions { + [Obsolete("This method is obsolete. Use the new method instead.")] internal static IEnumerable Rows(this ISheet sheet) { var e = sheet.GetRowEnumerator(); diff --git a/src/Business/Grand.Business.Common/Utilities/PowerExcelMapper.cs b/src/Business/Grand.Business.Common/Utilities/PowerExcelMapper.cs index 50c5ef9e1..33406fd15 100644 --- a/src/Business/Grand.Business.Common/Utilities/PowerExcelMapper.cs +++ b/src/Business/Grand.Business.Common/Utilities/PowerExcelMapper.cs @@ -289,8 +289,7 @@ private object GetCellValue(ICell cell, ColumnInfo targetColumn) case CellType.Boolean: return cell.BooleanCellValue; case CellType.Error: - return cell.ErrorCellValue; - case CellType.Unknown: + return cell.ErrorCellValue; case CellType.Blank: case CellType.String: default: diff --git a/src/Business/Grand.Business.Storage/Services/AzurePictureService.cs b/src/Business/Grand.Business.Storage/Services/AzurePictureService.cs index 9ee8bb017..b58e403d7 100644 --- a/src/Business/Grand.Business.Storage/Services/AzurePictureService.cs +++ b/src/Business/Grand.Business.Storage/Services/AzurePictureService.cs @@ -69,7 +69,7 @@ IMimeMappingService mimeMappingService protected override async Task DeletePictureThumbs(Picture picture) { var filter = $"{picture.Id}"; - var blobs = _container.GetBlobs(BlobTraits.All, BlobStates.All, filter); + var blobs = _container.GetBlobs(BlobTraits.All, BlobStates.All, filter, default); foreach (var blob in blobs) await _container.DeleteBlobAsync(blob.Name); } diff --git a/src/Plugins/Authentication.Facebook/Authentication.Facebook.csproj b/src/Plugins/Authentication.Facebook/Authentication.Facebook.csproj index 533e45aeb..81006cd9d 100644 --- a/src/Plugins/Authentication.Facebook/Authentication.Facebook.csproj +++ b/src/Plugins/Authentication.Facebook/Authentication.Facebook.csproj @@ -21,7 +21,7 @@ - + diff --git a/src/Plugins/Authentication.Google/Authentication.Google.csproj b/src/Plugins/Authentication.Google/Authentication.Google.csproj index 97d50367a..a76e7720c 100644 --- a/src/Plugins/Authentication.Google/Authentication.Google.csproj +++ b/src/Plugins/Authentication.Google/Authentication.Google.csproj @@ -20,7 +20,7 @@ - + diff --git a/src/Plugins/Payments.BrainTree/Payments.BrainTree.csproj b/src/Plugins/Payments.BrainTree/Payments.BrainTree.csproj index 0627e4182..96795784c 100644 --- a/src/Plugins/Payments.BrainTree/Payments.BrainTree.csproj +++ b/src/Plugins/Payments.BrainTree/Payments.BrainTree.csproj @@ -22,7 +22,7 @@ - + diff --git a/src/Plugins/Payments.StripeCheckout/Payments.StripeCheckout.csproj b/src/Plugins/Payments.StripeCheckout/Payments.StripeCheckout.csproj index e54f982b0..cd4f0e44b 100644 --- a/src/Plugins/Payments.StripeCheckout/Payments.StripeCheckout.csproj +++ b/src/Plugins/Payments.StripeCheckout/Payments.StripeCheckout.csproj @@ -21,7 +21,7 @@ - + diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/OrderCalculationServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/OrderCalculationServiceTests.cs index b5f388971..e78c083e9 100644 --- a/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/OrderCalculationServiceTests.cs +++ b/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/OrderCalculationServiceTests.cs @@ -102,8 +102,8 @@ public async Task GetShoppingCartSubTotalTest() var shoppingCartItem = new List { new() { Quantity = 1 } }; var result = await _service.GetShoppingCartSubTotal(shoppingCartItem, false); - - Assert.IsNotNull(result); + + Assert.IsTrue(result.subTotalWithDiscount >= 0); } [TestMethod]