Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.
C# aspnet-corecsharpdockerdotnetecommerceecommerce-platformmongodbmulti-storemulti-vendornosqlonline-shopshoppingcart
Update nuget packages to the latest version
support9ebf429be0da
diff --git a/src/Business/Grand.Business.Common/Grand.Business.Common.csproj b/src/Business/Grand.Business.Common/Grand.Business.Common.csprojindex b8badd4cf..30df11234 100644--- a/src/Business/Grand.Business.Common/Grand.Business.Common.csproj+++ b/src/Business/Grand.Business.Common/Grand.Business.Common.csproj@@ -1,7 +1,7 @@<Project Sdk="Microsoft.NET.Sdk"><Import Project="..\..\Build\Grand.Common.props" /><ItemGroup>- <PackageReference Include="ExcelMapper" Version="5.2.482" />+ <PackageReference Include="ExcelMapper" Version="5.2.483" /><PackageReference Include="NPOI" Version="2.6.0" /><PackageReference Include="Scryber.Core.Mvc" Version="6.0.0.14-beta" /><PackageReference Include="Scryber.Core.OpenType" Version="6.0.0.5-beta" />diff --git a/src/Business/Grand.Business.Messages/Grand.Business.Messages.csproj b/src/Business/Grand.Business.Messages/Grand.Business.Messages.csprojindex cdb52f8aa..394a6a53f 100644--- a/src/Business/Grand.Business.Messages/Grand.Business.Messages.csproj+++ b/src/Business/Grand.Business.Messages/Grand.Business.Messages.csproj@@ -7,6 +7,6 @@<ProjectReference Include="..\Grand.Business.Core\Grand.Business.Core.csproj" /></ItemGroup><ItemGroup>- <PackageReference Include="MailKit" Version="3.4.3" />+ <PackageReference Include="MailKit" Version="3.5.0" /></ItemGroup></Project>diff --git a/src/Business/Grand.Business.Storage/Grand.Business.Storage.csproj b/src/Business/Grand.Business.Storage/Grand.Business.Storage.csprojindex 5f58ef153..c668cccea 100644--- a/src/Business/Grand.Business.Storage/Grand.Business.Storage.csproj+++ b/src/Business/Grand.Business.Storage/Grand.Business.Storage.csproj@@ -7,8 +7,8 @@<ProjectReference Include="..\Grand.Business.Core\Grand.Business.Core.csproj" /></ItemGroup><ItemGroup>- <PackageReference Include="AWSSDK.Core" Version="3.7.103.20" />- <PackageReference Include="AWSSDK.S3" Version="3.7.101.58" />+ <PackageReference Include="AWSSDK.Core" Version="3.7.105.4" />+ <PackageReference Include="AWSSDK.S3" Version="3.7.103.11" /><PackageReference Include="Azure.Storage.Blobs" Version="12.14.1" /><PackageReference Include="SkiaSharp" Version="2.88.3" /><PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.3" />diff --git a/src/Business/Grand.Business.Storage/Services/AmazonPictureService.cs b/src/Business/Grand.Business.Storage/Services/AmazonPictureService.csindex 0252f1e85..0bd61955d 100644--- a/src/Business/Grand.Business.Storage/Services/AmazonPictureService.cs+++ b/src/Business/Grand.Business.Storage/Services/AmazonPictureService.cs@@ -83,10 +83,11 @@ namespace Grand.Business.Storage.Services{if (!_bucketExist){- _bucketExist = await _s3Client.DoesS3BucketExistAsync(_bucketName);++ _bucketExist = await Amazon.S3.Util.AmazonS3Util.DoesS3BucketExistV2Async(_s3Client, _bucketName);while (_bucketExist == false){- S3Region s3Region = S3Region.FindValue(_config.AmazonRegion);+ var s3Region = S3Region.FindValue(_config.AmazonRegion);var putBucketRequest = new PutBucketRequest {BucketName = _bucketName,BucketRegion = s3Region,@@ -104,7 +105,7 @@ namespace Grand.Business.Storage.Servicesthrow;}- _bucketExist = await _s3Client.DoesS3BucketExistAsync(_bucketName);+ _bucketExist = await Amazon.S3.Util.AmazonS3Util.DoesS3BucketExistV2Async(_s3Client, _bucketName);}}}diff --git a/src/Core/Grand.Domain/Grand.Domain.csproj b/src/Core/Grand.Domain/Grand.Domain.csprojindex 10d477069..9acbe12e1 100644--- a/src/Core/Grand.Domain/Grand.Domain.csproj+++ b/src/Core/Grand.Domain/Grand.Domain.csproj@@ -2,10 +2,10 @@<Import Project="..\..\Build\Grand.Common.props" /><ItemGroup><PackageReference Include="LiteDB" Version="5.0.15" />- <PackageReference Include="MongoDB.Bson" Version="2.18.0" />- <PackageReference Include="MongoDB.Driver" Version="2.18.0" />- <PackageReference Include="MongoDB.Driver.Core" Version="2.18.0" />- <PackageReference Include="MongoDB.Driver.GridFS" Version="2.18.0" />+ <PackageReference Include="MongoDB.Bson" Version="2.19.0" />+ <PackageReference Include="MongoDB.Driver" Version="2.19.0" />+ <PackageReference Include="MongoDB.Driver.Core" Version="2.19.0" />+ <PackageReference Include="MongoDB.Driver.GridFS" Version="2.19.0" /><PackageReference Include="DotLiquid" Version="2.2.677" /></ItemGroup>diff --git a/src/Core/Grand.Infrastructure/Grand.Infrastructure.csproj b/src/Core/Grand.Infrastructure/Grand.Infrastructure.csprojindex 1f47faa39..d0ed222c2 100644--- a/src/Core/Grand.Infrastructure/Grand.Infrastructure.csproj+++ b/src/Core/Grand.Infrastructure/Grand.Infrastructure.csproj@@ -2,11 +2,11 @@<Import Project="..\..\Build\Grand.Common.props" /><ItemGroup><PackageReference Include="GoogleAuthenticator" Version="3.0.0" />- <PackageReference Include="MassTransit" Version="8.0.11" />- <PackageReference Include="MassTransit.RabbitMQ" Version="8.0.11" />+ <PackageReference Include="MassTransit" Version="8.0.12" />+ <PackageReference Include="MassTransit.RabbitMQ" Version="8.0.12" /><PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />- <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.12" />- <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.12" />+ <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.14" />+ <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.14" /><PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" /><PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" /><PackageReference Include="Microsoft.Extensions.DependencyModel" Version="7.0.0" />@@ -14,9 +14,8 @@<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.0" /><PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0" /><PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.4.0" />- <PackageReference Include="MediatR" Version="11.1.0" />- <PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="11.0.0" />- <PackageReference Include="Scrutor" Version="4.2.0" />+ <PackageReference Include="MediatR" Version="12.0.0" />+ <PackageReference Include="Scrutor" Version="4.2.1" /><PackageReference Include="StackExchange.Redis" Version="2.6.90" /><PackageReference Include="Serilog.AspNetCore" Version="6.1.0" /><PackageReference Include="FluentValidation.AspNetCore" Version="11.2.2" />diff --git a/src/Core/Grand.Infrastructure/Startup/StartupApplication.cs b/src/Core/Grand.Infrastructure/Startup/StartupApplication.csindex 710edccdc..8c20b06bb 100644--- a/src/Core/Grand.Infrastructure/Startup/StartupApplication.cs+++ b/src/Core/Grand.Infrastructure/Startup/StartupApplication.cs@@ -52,8 +52,7 @@ namespace Grand.Infrastructure.Startupvar mongoUrl = new MongoUrl(connectionString);var databaseName = mongoUrl.DatabaseName;var clientSettings = MongoClientSettings.FromConnectionString(connectionString);- clientSettings.LinqProvider = MongoDB.Driver.Linq.LinqProvider.V3;-+if (applicationInsights.Enabled)clientSettings.ClusterConfigurator = builder => { builder.Subscribe(new ApplicationInsightsSubscriber(serviceCollection)); };diff --git a/src/Core/Grand.Infrastructure/StartupBase.cs b/src/Core/Grand.Infrastructure/StartupBase.csindex 8a0ef6b8e..55e890185 100644--- a/src/Core/Grand.Infrastructure/StartupBase.cs+++ b/src/Core/Grand.Infrastructure/StartupBase.cs@@ -151,7 +151,10 @@ namespace Grand.Infrastructureprivate static void AddMediator(this IServiceCollection services, ITypeSearcher typeSearcher){var assemblies = typeSearcher.GetAssemblies().ToArray();- services.AddMediatR(assemblies);+ services.AddMediatR(options =>+ {+ options.RegisterServicesFromAssemblies(assemblies);+ });}/// <summary>diff --git a/src/Core/Grand.SharedKernel/Extensions/CommonHelper.cs b/src/Core/Grand.SharedKernel/Extensions/CommonHelper.csindex 142289e80..b06ea3c18 100644--- a/src/Core/Grand.SharedKernel/Extensions/CommonHelper.cs+++ b/src/Core/Grand.SharedKernel/Extensions/CommonHelper.cs@@ -165,14 +165,14 @@ namespace Grand.SharedKernel.Extensions/// </summary>/// <param name="type"></param>/// <returns></returns>- public static bool IsSimpleType(Type? type)+ public static bool IsSimpleType(Type type){if (type == null)return true;returntype.IsPrimitive ||- new Type[] {+ new[] {typeof(string),typeof(decimal),typeof(DateTime),@@ -210,11 +210,11 @@ namespace Grand.SharedKernel.Extensionsvar sourceType = value.GetType();var destinationConverter = TypeDescriptor.GetConverter(destinationType);- if (destinationConverter != null && destinationConverter.CanConvertFrom(value.GetType()))+ if (destinationConverter.CanConvertFrom(value.GetType()))return destinationConverter.ConvertFrom(null, culture, value);var sourceConverter = TypeDescriptor.GetConverter(sourceType);- if (sourceConverter != null && sourceConverter.CanConvertTo(destinationType))+ if (sourceConverter.CanConvertTo(destinationType))return sourceConverter.ConvertTo(null, culture, value, destinationType);if (destinationType.IsEnum && value is int)diff --git a/src/Plugins/Authentication.Facebook/Authentication.Facebook.csproj b/src/Plugins/Authentication.Facebook/Authentication.Facebook.csprojindex ffe058919..3b1e7d1a3 100644--- a/src/Plugins/Authentication.Facebook/Authentication.Facebook.csproj+++ b/src/Plugins/Authentication.Facebook/Authentication.Facebook.csproj@@ -20,12 +20,12 @@</Target><ItemGroup>- <PackageReference Include="Microsoft.AspNetCore.Authentication.Facebook" Version="6.0.13" />+ <PackageReference Include="Microsoft.AspNetCore.Authentication.Facebook" Version="6.0.14" /></ItemGroup><Target Name="CopyFile" AfterTargets="AfterBuild"><ItemGroup>- <CopyFiles Include="$(NuGetPackageRoot)\microsoft.aspnetcore.authentication.facebook\6.0.13\lib\net6.0\*.dll" />+ <CopyFiles Include="$(NuGetPackageRoot)\microsoft.aspnetcore.authentication.facebook\6.0.14\lib\net6.0\*.dll" /></ItemGroup><Copy SourceFiles="@(CopyFiles)" DestinationFolder="..\..\Web\Grand.Web\Plugins\Authentication.Facebook\" /></Target>diff --git a/src/Plugins/Authentication.Google/Authentication.Google.csproj b/src/Plugins/Authentication.Google/Authentication.Google.csprojindex 9456b697b..2d4ab7da4 100644--- a/src/Plugins/Authentication.Google/Authentication.Google.csproj+++ b/src/Plugins/Authentication.Google/Authentication.Google.csproj@@ -19,12 +19,12 @@</Target><ItemGroup>- <PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="6.0.13" />+ <PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="6.0.14" /></ItemGroup><Target Name="CopyFile" AfterTargets="AfterBuild"><ItemGroup>- <CopyFiles Include="$(NuGetPackageRoot)\microsoft.aspnetcore.authentication.google\6.0.13\lib\net6.0\*.dll" />+ <CopyFiles Include="$(NuGetPackageRoot)\microsoft.aspnetcore.authentication.google\6.0.14\lib\net6.0\*.dll" /></ItemGroup><Copy SourceFiles="@(CopyFiles)" DestinationFolder="..\..\Web\Grand.Web\Plugins\Authentication.Google\" /></Target>diff --git a/src/Web/Grand.Web.Admin/Grand.Web.Admin.csproj b/src/Web/Grand.Web.Admin/Grand.Web.Admin.csprojindex d3b2b48a9..06852676e 100644--- a/src/Web/Grand.Web.Admin/Grand.Web.Admin.csproj+++ b/src/Web/Grand.Web.Admin/Grand.Web.Admin.csproj@@ -18,7 +18,7 @@<PackageReference Include="elFinder.Net.Drivers.FileSystem" Version="1.5.0" /><PackageReference Include="Google.Apis" Version="1.59.0" /><PackageReference Include="Google.Apis.AnalyticsReporting.v4" Version="1.59.0.2484" />- <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="6.0.12" />+ <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="6.0.14" /></ItemGroup><ItemGroup><ProjectReference Include="..\..\Business\Grand.Business.Core\Grand.Business.Core.csproj" />diff --git a/src/Web/Grand.Web.Common/Grand.Web.Common.csproj b/src/Web/Grand.Web.Common/Grand.Web.Common.csprojindex f3e40be91..fabd06c40 100644--- a/src/Web/Grand.Web.Common/Grand.Web.Common.csproj+++ b/src/Web/Grand.Web.Common/Grand.Web.Common.csproj@@ -1,20 +1,20 @@<Project Sdk="Microsoft.NET.Sdk"><Import Project="..\..\Build\Grand.Common.props" /><ItemGroup>- <PackageReference Include="Azure.Extensions.AspNetCore.DataProtection.Blobs" Version="1.2.3" />- <PackageReference Include="Azure.Extensions.AspNetCore.DataProtection.Keys" Version="1.1.0" />- <PackageReference Include="Azure.Identity" Version="1.8.1" />+ <PackageReference Include="Azure.Extensions.AspNetCore.DataProtection.Blobs" Version="1.3.0" />+ <PackageReference Include="Azure.Extensions.AspNetCore.DataProtection.Keys" Version="1.2.0" />+ <PackageReference Include="Azure.Identity" Version="1.8.2" /><PackageReference Include="Flurl.Http" Version="3.2.4" />- <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="6.0.12" />+ <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="6.0.14" /><PackageReference Include="AspNetCore.HealthChecks.MongoDb" Version="6.0.2" /><PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.2.22" /><PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders" Version="0.18.0" /><PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0" /><PackageReference Include="Wangkanai.Detection" Version="7.0.0" />- <PackageReference Include="WebMarkupMin.AspNetCore6" Version="2.13.5" />- <PackageReference Include="WebMarkupMin.Core" Version="2.13.0" />- <PackageReference Include="WebMarkupMin.NUglify" Version="2.13.5" />- <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="6.0.12" />+ <PackageReference Include="WebMarkupMin.AspNetCore6" Version="2.13.8" />+ <PackageReference Include="WebMarkupMin.Core" Version="2.13.8" />+ <PackageReference Include="WebMarkupMin.NUglify" Version="2.13.6" />+ <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="6.0.14" /></ItemGroup><ItemGroup>diff --git a/src/Web/Grand.Web/Commands/Handler/Customers/SubAccountAddCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Customers/SubAccountAddCommandHandler.csindex 951e670ab..c8734807c 100644--- a/src/Web/Grand.Web/Commands/Handler/Customers/SubAccountAddCommandHandler.cs+++ b/src/Web/Grand.Web/Commands/Handler/Customers/SubAccountAddCommandHandler.cs@@ -7,7 +7,7 @@ using MediatR;namespace Grand.Web.Commands.Handler.Customers{- public class SubAccountAddCommandHandler : IRequestHandler<SubAccountAddCommand, Unit>+ public class SubAccountAddCommandHandler : IRequestHandler<SubAccountAddCommand>{private readonly ICustomerService _customerService;private readonly ICustomerManagerService _customerManagerService;@@ -26,7 +26,7 @@ namespace Grand.Web.Commands.Handler.Customers_customerSettings = customerSettings;}- public async Task<Unit> Handle(SubAccountAddCommand request, CancellationToken cancellationToken)+ public async Task Handle(SubAccountAddCommand request, CancellationToken cancellationToken){var customer = await PrepareCustomer(request);@@ -38,7 +38,7 @@ namespace Grand.Web.Commands.Handler.Customersawait _userFieldService.SaveField(customer, SystemCustomerFieldNames.FirstName, request.Model.FirstName);await _userFieldService.SaveField(customer, SystemCustomerFieldNames.LastName, request.Model.LastName);- return Unit.Value;+}protected async Task<Customer> PrepareCustomer(SubAccountAddCommand request)diff --git a/src/Web/Grand.Web/Controllers/AccountController.cs b/src/Web/Grand.Web/Controllers/AccountController.csindex 625b52792..ebbaf857e 100644--- a/src/Web/Grand.Web/Controllers/AccountController.cs+++ b/src/Web/Grand.Web/Controllers/AccountController.cs@@ -1203,7 +1203,7 @@ namespace Grand.Web.Controllersif (!ModelState.IsValid) return View(model);- _ = await _mediator.Send(new SubAccountAddCommand {+ await _mediator.Send(new SubAccountAddCommand {Customer = _workContext.CurrentCustomer,Model = model,Store = _workContext.CurrentStore