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
Migrate to ASP.NET Core 8.0 (#428) (#448)
Krzysztof Pajak10499ff19484
diff --git a/.github/workflows/aspnetcore.yml b/.github/workflows/aspnetcore.ymlindex 9136896fd..7c71f65f5 100644--- a/.github/workflows/aspnetcore.yml+++ b/.github/workflows/aspnetcore.yml@@ -12,7 +12,7 @@ jobs:- name: Setup .NET Coreuses: actions/setup-dotnet@v1with:- dotnet-version: 6.0.x+ dotnet-version: 8.0.x- name: Restorerun: dotnet restore ./GrandNode.sln- name: Build with dotnetdiff --git a/.github/workflows/grandnode.yml b/.github/workflows/grandnode.ymlindex 0cd321e73..dd7d6a622 100644--- a/.github/workflows/grandnode.yml+++ b/.github/workflows/grandnode.yml@@ -8,7 +8,7 @@ env:AZURE_WEBAPP_PACKAGE_PATH: src/Web/Grand.Web/publishAZURE_WEBAPP_PUBLISH_PROFILE: ${{ secrets.AZURE_WEBAPP_PUBLISH_PROFILE }}CONFIGURATION: Release- DOTNET_CORE_VERSION: 6.0.x+ DOTNET_CORE_VERSION: 8.0.xWORKING_DIRECTORY: src/Web/Grand.Webjobs:build-and-deploy:diff --git a/Dockerfile b/Dockerfileindex ea4a4fee9..2c7ae427e 100644--- a/Dockerfile+++ b/Dockerfile@@ -1,4 +1,4 @@-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build-env+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build-envLABEL stage=build-envWORKDIR /app@@ -35,7 +35,7 @@ RUN dotnet build /app/Web/Grand.Web/Grand.Web.csproj --no-restore -c Release -p:RUN dotnet publish /app/Web/Grand.Web --no-restore -c Release -o ./build/release -p:SourceRevisionId=$GIT_COMMIT -p:GitBranch=$GIT_BRANCH# Build runtime image-FROM mcr.microsoft.com/dotnet/aspnet:6.0+FROM mcr.microsoft.com/dotnet/aspnet:8.0EXPOSE 80ENV ASPNETCORE_URLS http://+:80WORKDIR /appdiff --git a/azure-pipelines.yml b/azure-pipelines.ymlindex b59c30fdc..3b000acd9 100644--- a/azure-pipelines.yml+++ b/azure-pipelines.yml@@ -25,9 +25,9 @@ services:steps:- task: UseDotNet@2- displayName: 'Install .NET Core SDK 6'+ displayName: 'Install .NET Core SDK 8'inputs:- version: '6.0.x'+ version: '8.0.x'- task: NuGetToolInstaller@1displayName: 'Install NuGet >=6.3.0-0'diff --git a/global.json b/global.jsonindex 18b4598f7..789bff3bd 100644--- a/global.json+++ b/global.json@@ -1,6 +1,7 @@{"sdk": {- "version": "6.0.400",- "rollForward": "latestFeature"+ "version": "8.0.100",+ "rollForward": "latestFeature",+ "allowPrerelease": false}-}+}\ No newline at end of filediff --git a/src/Build/Grand.Common.props b/src/Build/Grand.Common.propsindex 8ef9f53ff..f38525068 100644--- a/src/Build/Grand.Common.props+++ b/src/Build/Grand.Common.props@@ -1,6 +1,6 @@<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"><PropertyGroup>- <TargetFramework>net6.0</TargetFramework>+ <TargetFramework>net8.0</TargetFramework></PropertyGroup><PropertyGroup><Product>grandnode</Product>diff --git a/src/Business/Grand.Business.Catalog/Grand.Business.Catalog.csproj b/src/Business/Grand.Business.Catalog/Grand.Business.Catalog.csprojindex 81b96989c..9cf16d40b 100644--- a/src/Business/Grand.Business.Catalog/Grand.Business.Catalog.csproj+++ b/src/Business/Grand.Business.Catalog/Grand.Business.Catalog.csproj@@ -7,6 +7,6 @@<ProjectReference Include="..\Grand.Business.Core\Grand.Business.Core.csproj" /></ItemGroup><ItemGroup>- <PackageReference Include="MaxMind.GeoIP2" Version="5.1.0" />+ <PackageReference Include="MaxMind.GeoIP2" Version="5.2.0" /></ItemGroup></Project>diff --git a/src/Business/Grand.Business.Messages/Grand.Business.Messages.csproj b/src/Business/Grand.Business.Messages/Grand.Business.Messages.csprojindex 7ed95fb9d..768d13161 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="4.2.0" />+ <PackageReference Include="MailKit" Version="4.3.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 38cd04752..028b22423 100644--- a/src/Business/Grand.Business.Storage/Grand.Business.Storage.csproj+++ b/src/Business/Grand.Business.Storage/Grand.Business.Storage.csproj@@ -7,9 +7,9 @@<ProjectReference Include="..\Grand.Business.Core\Grand.Business.Core.csproj" /></ItemGroup><ItemGroup>- <PackageReference Include="AWSSDK.Core" Version="3.7.204.14" />- <PackageReference Include="AWSSDK.S3" Version="3.7.205.24" />- <PackageReference Include="Azure.Storage.Blobs" Version="12.19.0" />+ <PackageReference Include="AWSSDK.Core" Version="3.7.300.17" />+ <PackageReference Include="AWSSDK.S3" Version="3.7.304.6" />+ <PackageReference Include="Azure.Storage.Blobs" Version="12.19.1" /><PackageReference Include="SkiaSharp" Version="2.88.6" /><PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.6" /></ItemGroup>diff --git a/src/Core/Grand.Domain/Grand.Domain.csproj b/src/Core/Grand.Domain/Grand.Domain.csprojindex c66a7a225..2fa65c05e 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.17" />- <PackageReference Include="MongoDB.Bson" Version="2.22.0" />- <PackageReference Include="MongoDB.Driver" Version="2.22.0" />- <PackageReference Include="MongoDB.Driver.Core" Version="2.22.0" />- <PackageReference Include="MongoDB.Driver.GridFS" Version="2.22.0" />+ <PackageReference Include="MongoDB.Bson" Version="2.23.0" />+ <PackageReference Include="MongoDB.Driver" Version="2.23.0" />+ <PackageReference Include="MongoDB.Driver.Core" Version="2.23.0" />+ <PackageReference Include="MongoDB.Driver.GridFS" Version="2.23.0" /><PackageReference Include="DotLiquid" Version="2.2.692" /></ItemGroup>diff --git a/src/Core/Grand.Infrastructure/Grand.Infrastructure.csproj b/src/Core/Grand.Infrastructure/Grand.Infrastructure.csprojindex 403326105..cedde646e 100644--- a/src/Core/Grand.Infrastructure/Grand.Infrastructure.csproj+++ b/src/Core/Grand.Infrastructure/Grand.Infrastructure.csproj@@ -1,24 +1,24 @@<Project Sdk="Microsoft.NET.Sdk"><Import Project="..\..\Build\Grand.Common.props" /><ItemGroup>- <PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.8.0" />+ <PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.8.1" /><PackageReference Include="GoogleAuthenticator" Version="3.1.1" />- <PackageReference Include="MassTransit" Version="8.1.1" />- <PackageReference Include="MassTransit.RabbitMQ" Version="8.1.1" />- <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />- <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.24" />- <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.24" />- <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" />+ <PackageReference Include="MassTransit" Version="8.1.2" />+ <PackageReference Include="MassTransit.RabbitMQ" Version="8.1.2" />+ <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />+ <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.0" />+ <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.0" />+ <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />+ <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />+ <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="8.0.0" /><PackageReference Include="AutoMapper" Version="12.0.1" />- <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.7.0" />- <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.7.0" />- <PackageReference Include="MediatR" Version="12.1.1" />+ <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />+ <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.8.0" />+ <PackageReference Include="MediatR" Version="12.2.0" /><PackageReference Include="Scrutor" Version="4.2.2" />- <PackageReference Include="StackExchange.Redis" Version="2.7.4" />- <PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />- <PackageReference Include="FluentValidation" Version="11.8.0" />+ <PackageReference Include="StackExchange.Redis" Version="2.7.10" />+ <PackageReference Include="Serilog.AspNetCore" Version="8.0.0" />+ <PackageReference Include="FluentValidation" Version="11.8.1" /></ItemGroup><ItemGroup><ProjectReference Include="..\Grand.Domain\Grand.Domain.csproj" />diff --git a/src/Plugins/Authentication.Facebook/Authentication.Facebook.csproj b/src/Plugins/Authentication.Facebook/Authentication.Facebook.csprojindex 736236b8a..b358b7602 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.24" />+ <PackageReference Include="Microsoft.AspNetCore.Authentication.Facebook" Version="8.0.0" /></ItemGroup><Target Name="CopyFile" AfterTargets="AfterBuild"><ItemGroup>- <CopyFiles Include="$(NuGetPackageRoot)\microsoft.aspnetcore.authentication.facebook\6.0.24\lib\net6.0\*.dll" />+ <CopyFiles Include="$(NuGetPackageRoot)\microsoft.aspnetcore.authentication.facebook\8.0.0\lib\net8.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 625dacbff..c7ca115b6 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.24" />+ <PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="8.0.0" /></ItemGroup><Target Name="CopyFile" AfterTargets="AfterBuild"><ItemGroup>- <CopyFiles Include="$(NuGetPackageRoot)\microsoft.aspnetcore.authentication.google\6.0.24\lib\net6.0\*.dll" />+ <CopyFiles Include="$(NuGetPackageRoot)\microsoft.aspnetcore.authentication.google\8.0.0\lib\net8.0\*.dll" /></ItemGroup><Copy SourceFiles="@(CopyFiles)" DestinationFolder="..\..\Web\Grand.Web\Plugins\Authentication.Google\" /></Target>diff --git a/src/Plugins/Payments.BrainTree/Payments.BrainTree.csproj b/src/Plugins/Payments.BrainTree/Payments.BrainTree.csprojindex 163f8aa52..93ed2b2ee 100644--- a/src/Plugins/Payments.BrainTree/Payments.BrainTree.csproj+++ b/src/Plugins/Payments.BrainTree/Payments.BrainTree.csproj@@ -20,13 +20,13 @@</Target><ItemGroup>- <PackageReference Include="Braintree" Version="5.20.0" />+ <PackageReference Include="Braintree" Version="5.21.0" /><PackageReference Include="System.Xml.XPath.XmlDocument" Version="4.3.0" /></ItemGroup><Target Name="CopyFile" AfterTargets="AfterBuild"><ItemGroup>- <CopyFiles Include="$(NuGetPackageRoot)\braintree\5.20.0\lib\netstandard2.0\*.*" />+ <CopyFiles Include="$(NuGetPackageRoot)\braintree\5.21.0\lib\netstandard2.0\*.*" /><CopyFiles Include="$(NuGetPackageRoot)\system.xml.xpath.xmldocument\4.3.0\lib\netstandard1.3\*.*" /></ItemGroup><Copy SourceFiles="@(CopyFiles)" DestinationFolder="..\..\Web\Grand.Web\Plugins\Payments.BrainTree\" />diff --git a/src/Tests/Grand.Business.Authentication.Tests/Grand.Business.Authentication.Tests.csproj b/src/Tests/Grand.Business.Authentication.Tests/Grand.Business.Authentication.Tests.csprojindex 6b64b63a6..ed2ca0819 100644--- a/src/Tests/Grand.Business.Authentication.Tests/Grand.Business.Authentication.Tests.csproj+++ b/src/Tests/Grand.Business.Authentication.Tests/Grand.Business.Authentication.Tests.csproj@@ -6,7 +6,7 @@<ItemGroup><PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />- <PackageReference Include="Moq" Version="4.20.69" />+ <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="coverlet.collector" Version="6.0.0">diff --git a/src/Tests/Grand.Business.Catalog.Tests/Grand.Business.Catalog.Tests.csproj b/src/Tests/Grand.Business.Catalog.Tests/Grand.Business.Catalog.Tests.csprojindex af2e33160..def99c446 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Grand.Business.Catalog.Tests.csproj+++ b/src/Tests/Grand.Business.Catalog.Tests/Grand.Business.Catalog.Tests.csproj@@ -6,7 +6,7 @@<ItemGroup><PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />- <PackageReference Include="Moq" Version="4.20.69" />+ <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="coverlet.collector" Version="6.0.0">diff --git a/src/Tests/Grand.Business.Checkout.Tests/Grand.Business.Checkout.Tests.csproj b/src/Tests/Grand.Business.Checkout.Tests/Grand.Business.Checkout.Tests.csprojindex 1e881f90b..4844b99a8 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Grand.Business.Checkout.Tests.csproj+++ b/src/Tests/Grand.Business.Checkout.Tests/Grand.Business.Checkout.Tests.csproj@@ -6,7 +6,7 @@<ItemGroup><PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />- <PackageReference Include="Moq" Version="4.20.69" />+ <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="coverlet.collector" Version="6.0.0">diff --git a/src/Tests/Grand.Business.Cms.Tests/Grand.Business.Cms.Tests.csproj b/src/Tests/Grand.Business.Cms.Tests/Grand.Business.Cms.Tests.csprojindex 65138040c..34b3ba59d 100644--- a/src/Tests/Grand.Business.Cms.Tests/Grand.Business.Cms.Tests.csproj+++ b/src/Tests/Grand.Business.Cms.Tests/Grand.Business.Cms.Tests.csproj@@ -6,7 +6,7 @@<ItemGroup><PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />- <PackageReference Include="Moq" Version="4.20.69" />+ <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="coverlet.collector" Version="6.0.0">diff --git a/src/Tests/Grand.Business.Common.Tests/Grand.Business.Common.Tests.csproj b/src/Tests/Grand.Business.Common.Tests/Grand.Business.Common.Tests.csprojindex af2e33160..def99c446 100644--- a/src/Tests/Grand.Business.Common.Tests/Grand.Business.Common.Tests.csproj+++ b/src/Tests/Grand.Business.Common.Tests/Grand.Business.Common.Tests.csproj@@ -6,7 +6,7 @@<ItemGroup><PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />- <PackageReference Include="Moq" Version="4.20.69" />+ <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="coverlet.collector" Version="6.0.0">diff --git a/src/Tests/Grand.Business.Customers.Tests/Grand.Business.Customers.Tests.csproj b/src/Tests/Grand.Business.Customers.Tests/Grand.Business.Customers.Tests.csprojindex ee34599ae..cc616a2fc 100644--- a/src/Tests/Grand.Business.Customers.Tests/Grand.Business.Customers.Tests.csproj+++ b/src/Tests/Grand.Business.Customers.Tests/Grand.Business.Customers.Tests.csproj@@ -7,7 +7,7 @@<ItemGroup><PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />- <PackageReference Include="Moq" Version="4.20.69" />+ <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="coverlet.collector" Version="6.0.0">diff --git a/src/Tests/Grand.Business.Marketing.Tests/Grand.Business.Marketing.Tests.csproj b/src/Tests/Grand.Business.Marketing.Tests/Grand.Business.Marketing.Tests.csprojindex f660e6e28..dbc9bc533 100644--- a/src/Tests/Grand.Business.Marketing.Tests/Grand.Business.Marketing.Tests.csproj+++ b/src/Tests/Grand.Business.Marketing.Tests/Grand.Business.Marketing.Tests.csproj@@ -6,7 +6,7 @@<ItemGroup><PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />- <PackageReference Include="Moq" Version="4.20.69" />+ <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="coverlet.collector" Version="6.0.0">diff --git a/src/Tests/Grand.Business.Messages.Tests/Grand.Business.Messages.Tests.csproj b/src/Tests/Grand.Business.Messages.Tests/Grand.Business.Messages.Tests.csprojindex b1dc8cdac..4bc11e343 100644--- a/src/Tests/Grand.Business.Messages.Tests/Grand.Business.Messages.Tests.csproj+++ b/src/Tests/Grand.Business.Messages.Tests/Grand.Business.Messages.Tests.csproj@@ -6,7 +6,7 @@<ItemGroup><PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />- <PackageReference Include="Moq" Version="4.20.69" />+ <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="coverlet.collector" Version="6.0.0">diff --git a/src/Tests/Grand.Business.Storage.Tests/Grand.Business.Storage.Tests.csproj b/src/Tests/Grand.Business.Storage.Tests/Grand.Business.Storage.Tests.csprojindex ec5fd74f7..48ec25abc 100644--- a/src/Tests/Grand.Business.Storage.Tests/Grand.Business.Storage.Tests.csproj+++ b/src/Tests/Grand.Business.Storage.Tests/Grand.Business.Storage.Tests.csproj@@ -6,14 +6,14 @@<ItemGroup><PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />- <PackageReference Include="Moq" Version="4.20.69" />+ <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="coverlet.collector" Version="6.0.0"><PrivateAssets>all</PrivateAssets><IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets></PackageReference>- <PackageReference Include="NUnit" Version="3.14.0" />+ <PackageReference Include="NUnit" Version="4.0.1" /></ItemGroup><ItemGroup>diff --git a/src/Tests/Grand.Business.System.Tests/Grand.Business.System.Tests.csproj b/src/Tests/Grand.Business.System.Tests/Grand.Business.System.Tests.csprojindex d750dc6a0..0cac8d67c 100644--- a/src/Tests/Grand.Business.System.Tests/Grand.Business.System.Tests.csproj+++ b/src/Tests/Grand.Business.System.Tests/Grand.Business.System.Tests.csproj@@ -6,7 +6,7 @@<ItemGroup><PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />- <PackageReference Include="Moq" Version="4.20.69" />+ <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="coverlet.collector" Version="6.0.0">diff --git a/src/Tests/Grand.Data.Tests/Grand.Data.Tests.csproj b/src/Tests/Grand.Data.Tests/Grand.Data.Tests.csprojindex 07280fab6..e87dfe91d 100644--- a/src/Tests/Grand.Data.Tests/Grand.Data.Tests.csproj+++ b/src/Tests/Grand.Data.Tests/Grand.Data.Tests.csproj@@ -6,14 +6,14 @@<ItemGroup><PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />- <PackageReference Include="Moq" Version="4.20.69" />+ <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="coverlet.collector" Version="6.0.0"><PrivateAssets>all</PrivateAssets><IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets></PackageReference>- <PackageReference Include="NUnit" Version="3.14.0" />+ <PackageReference Include="NUnit" Version="4.0.1" /></ItemGroup><ItemGroup>diff --git a/src/Tests/Grand.Domain.Tests/Grand.Domain.Tests.csproj b/src/Tests/Grand.Domain.Tests/Grand.Domain.Tests.csprojindex 3abd85c71..97e5510ab 100644--- a/src/Tests/Grand.Domain.Tests/Grand.Domain.Tests.csproj+++ b/src/Tests/Grand.Domain.Tests/Grand.Domain.Tests.csproj@@ -6,14 +6,14 @@<ItemGroup><PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />- <PackageReference Include="Moq" Version="4.20.69" />+ <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="coverlet.collector" Version="6.0.0"><PrivateAssets>all</PrivateAssets><IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets></PackageReference>- <PackageReference Include="NUnit" Version="3.14.0" />+ <PackageReference Include="NUnit" Version="4.0.1" /></ItemGroup><ItemGroup>diff --git a/src/Tests/Grand.Infrastructure.Tests/Grand.Infrastructure.Tests.csproj b/src/Tests/Grand.Infrastructure.Tests/Grand.Infrastructure.Tests.csprojindex 73c2fbdc5..7b6bb3e05 100644--- a/src/Tests/Grand.Infrastructure.Tests/Grand.Infrastructure.Tests.csproj+++ b/src/Tests/Grand.Infrastructure.Tests/Grand.Infrastructure.Tests.csproj@@ -5,14 +5,14 @@</PropertyGroup><ItemGroup><PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />- <PackageReference Include="Moq" Version="4.20.69" />+ <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="coverlet.collector" Version="6.0.0"><PrivateAssets>all</PrivateAssets><IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets></PackageReference>- <PackageReference Include="NUnit" Version="3.14.0" />+ <PackageReference Include="NUnit" Version="4.0.1" /></ItemGroup><ItemGroup>diff --git a/src/Tests/Grand.SharedKernel.Tests/Grand.SharedKernel.Tests.csproj b/src/Tests/Grand.SharedKernel.Tests/Grand.SharedKernel.Tests.csprojindex a78beda40..338b854ff 100644--- a/src/Tests/Grand.SharedKernel.Tests/Grand.SharedKernel.Tests.csproj+++ b/src/Tests/Grand.SharedKernel.Tests/Grand.SharedKernel.Tests.csproj@@ -6,14 +6,14 @@<ItemGroup><PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />- <PackageReference Include="Moq" Version="4.20.69" />+ <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="coverlet.collector" Version="6.0.0"><PrivateAssets>all</PrivateAssets><IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets></PackageReference>- <PackageReference Include="NUnit" Version="3.14.0" />+ <PackageReference Include="NUnit" Version="4.0.1" /></ItemGroup><ItemGroup>diff --git a/src/Tests/Grand.Web.Admin.Tests/Grand.Web.Admin.Tests.csproj b/src/Tests/Grand.Web.Admin.Tests/Grand.Web.Admin.Tests.csprojindex 977704b1e..9ec9692de 100644--- a/src/Tests/Grand.Web.Admin.Tests/Grand.Web.Admin.Tests.csproj+++ b/src/Tests/Grand.Web.Admin.Tests/Grand.Web.Admin.Tests.csproj@@ -7,14 +7,14 @@<ItemGroup><PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />- <PackageReference Include="Moq" Version="4.20.69" />+ <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="coverlet.collector" Version="6.0.0"><PrivateAssets>all</PrivateAssets><IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets></PackageReference>- <PackageReference Include="NUnit" Version="3.14.0" />+ <PackageReference Include="NUnit" Version="4.0.1" /></ItemGroup><ItemGroup>diff --git a/src/Tests/Grand.Web.Admin.Tests/MenuViewModelServiceTests.cs b/src/Tests/Grand.Web.Admin.Tests/MenuViewModelServiceTests.csindex 49882e791..e58b93fb5 100644--- a/src/Tests/Grand.Web.Admin.Tests/MenuViewModelServiceTests.cs+++ b/src/Tests/Grand.Web.Admin.Tests/MenuViewModelServiceTests.cs@@ -46,13 +46,13 @@ namespace Grand.Web.Admin.Tests;var result = await _menuViewModelService.MenuItems();// Assert- Assert.AreEqual(2, result.Count);- Assert.AreEqual("1", result[0].Id);- Assert.AreEqual("Item 1", result[0].SystemName);- Assert.AreEqual(1, result[0].DisplayOrder);- Assert.AreEqual("2", result[1].Id);- Assert.AreEqual("Item 2", result[1].SystemName);- Assert.AreEqual(2, result[1].DisplayOrder);+ Assert.Equals(2, result.Count);+ Assert.Equals("1", result[0].Id);+ Assert.Equals("Item 1", result[0].SystemName);+ Assert.Equals(1, result[0].DisplayOrder);+ Assert.Equals("2", result[1].Id);+ Assert.Equals("Item 2", result[1].SystemName);+ Assert.Equals(2, result[1].DisplayOrder);}[Test]@@ -71,9 +71,8 @@ namespace Grand.Web.Admin.Tests;var result = await _menuViewModelService.GetMenuById("2");// Assert- Assert.IsNotNull(result);- Assert.AreEqual("2", result.Id);- Assert.AreEqual("Item 2", result.SystemName);+ Assert.Equals("2", result.Id);+ Assert.Equals("Item 2", result.SystemName);}[Test]public async Task InsertMenuModel_AddsNewMenuModel()@@ -90,10 +89,9 @@ namespace Grand.Web.Admin.Tests;var result = await _menuViewModelService.InsertMenuModel(model, "1");// Assert- Assert.IsNotNull(result);- Assert.AreEqual("3", result.Id);- Assert.AreEqual("Item 3", result.SystemName);- Assert.AreEqual(1, parentEntity.ChildNodes.Count);+ Assert.Equals("3", result.Id);+ Assert.Equals("Item 3", result.SystemName);+ Assert.Equals(1, parentEntity.ChildNodes.Count);}[Test]@@ -114,9 +112,8 @@ namespace Grand.Web.Admin.Tests;var result = await _menuViewModelService.UpdateMenuModel(model);// Assert- Assert.IsNotNull(result);- Assert.AreEqual("2", result.Id);- Assert.AreEqual("Updated Item 2", result.SystemName);+ Assert.Equals("2", result.Id);+ Assert.Equals("Updated Item 2", result.SystemName);}[Test]public async Task UpdateMenuModel_UpdatesSubMenuModel()@@ -137,9 +134,8 @@ namespace Grand.Web.Admin.Tests;var result = await _menuViewModelService.UpdateMenuModel(model);// Assert- Assert.IsNotNull(result);- Assert.AreEqual("3", result.Id);- Assert.AreEqual("Updated Item 3", result.SystemName);+ Assert.Equals("3", result.Id);+ Assert.Equals("Updated Item 3", result.SystemName);}[Test]public async Task DeleteMenu_CallsDeleteSiteMap()diff --git a/src/Tests/Grand.Web.Common.Tests/Grand.Web.Common.Tests.csproj b/src/Tests/Grand.Web.Common.Tests/Grand.Web.Common.Tests.csprojindex d1ad7cefe..c78f65f6f 100644--- a/src/Tests/Grand.Web.Common.Tests/Grand.Web.Common.Tests.csproj+++ b/src/Tests/Grand.Web.Common.Tests/Grand.Web.Common.Tests.csproj@@ -7,14 +7,14 @@<ItemGroup><PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />- <PackageReference Include="Moq" Version="4.20.69" />+ <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="coverlet.collector" Version="6.0.0"><PrivateAssets>all</PrivateAssets><IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets></PackageReference>- <PackageReference Include="NUnit" Version="3.14.0" />+ <PackageReference Include="NUnit" Version="4.0.1" /></ItemGroup><ItemGroup>diff --git a/src/Web/Grand.Web.Admin/Program.cs b/src/Web/Grand.Web.Admin/Program.csindex e77dd2699..4cd3c4e02 100644--- a/src/Web/Grand.Web.Admin/Program.cs+++ b/src/Web/Grand.Web.Admin/Program.cs@@ -1,8 +1,6 @@-using Grand.Infrastructure.Configuration;-using Grand.Web.Admin.Extensions;+using Grand.Web.Admin.Extensions;+using Grand.Web.Common.Extensions;using Microsoft.AspNetCore.Builder;-using Microsoft.AspNetCore.Hosting;-using Microsoft.Extensions.Configuration;using Microsoft.Extensions.DependencyInjection;using Microsoft.Extensions.Hosting;using Serilog;@@ -23,49 +21,12 @@ builder.Host.UseSerilog((context, services, configuration) => configuration.Enrich.FromLogContext());//add configuration-builder.Host.ConfigureAppConfiguration((hostingContext, config) =>-{- config.SetBasePath(hostingContext.HostingEnvironment.ContentRootPath);- config.AddJsonFile("App_Data/appsettings.json", optional: false, reloadOnChange: true);- config.AddEnvironmentVariables();- if (args != null)- {- config.AddCommandLine(args);- var settings = config.Build();- var appsettings = settings["appsettings"];- var param = settings["Directory"];- if (!string.IsNullOrEmpty(appsettings) && !string.IsNullOrEmpty(param))- config.AddJsonFile($"App_Data/{param}/appsettings.json", optional: false, reloadOnChange: true);- }--});+builder.Configuration.AddAppSettingsJsonFile(args);//add servicesGrand.Infrastructure.StartupBase.ConfigureServices(builder.Services, builder.Configuration);-//Allow non ASCII chars in headers-var config = new AppConfig();-builder.Configuration.GetSection("Application").Bind(config);-if (config.AllowNonAsciiCharInHeaders)-{- builder.WebHost.ConfigureKestrel(options =>- {- options.ResponseHeaderEncodingSelector = _ => Encoding.UTF8;- });-}-if (config.MaxRequestBodySize.HasValue)-{- builder.WebHost.ConfigureKestrel(host =>- {- host.Limits.MaxRequestBodySize = config.MaxRequestBodySize.Value;- });-- builder.Services.Configure<Microsoft.AspNetCore.Http.Features.FormOptions>(opt =>- {- opt.MultipartBodyLengthLimit = config.MaxRequestBodySize.Value;- });--}+builder.ConfigureApplicationSettings();if (builder.Environment.IsDevelopment()){diff --git a/src/Web/Grand.Web.Common/Extensions/ConfigurationExtensions.cs b/src/Web/Grand.Web.Common/Extensions/ConfigurationExtensions.csnew file mode 100644index 000000000..a1056db33--- /dev/null+++ b/src/Web/Grand.Web.Common/Extensions/ConfigurationExtensions.cs@@ -0,0 +1,54 @@+using Grand.Infrastructure.Configuration;+using Microsoft.AspNetCore.Builder;+using Microsoft.AspNetCore.Hosting;+using Microsoft.AspNetCore.Http.Features;+using Microsoft.Extensions.Configuration;+using Microsoft.Extensions.DependencyInjection;++namespace Grand.Web.Common.Extensions+{+ public static class ConfigurationExtensions+ {++ public static void AddAppSettingsJsonFile(this IConfigurationManager configuration, string[] args)+ {+ configuration.AddJsonFile("App_Data/appsettings.json");+ configuration.AddEnvironmentVariables();+ if (args.Any())+ {+ configuration.AddCommandLine(args);+ var appSettings = configuration["appsettings"];+ if (!string.IsNullOrEmpty(appSettings))+ {+ configuration.AddJsonFile($"App_Data/{appSettings}/appsettings.json");+ }+ }+ }+ public static void ConfigureApplicationSettings(this WebApplicationBuilder builder)+ {+ //Allow non ASCII chars in headers+ var config = new AppConfig();+ builder.Configuration.GetSection("Application").Bind(config);+ if (config.AllowNonAsciiCharInHeaders)+ {+ builder.WebHost.ConfigureKestrel(options =>+ {+ options.ResponseHeaderEncodingSelector = _ => Encoding.UTF8;+ });+ }+ if (config.MaxRequestBodySize.HasValue)+ {+ builder.WebHost.ConfigureKestrel(host =>+ {+ host.Limits.MaxRequestBodySize = config.MaxRequestBodySize.Value;+ });++ builder.Services.Configure<FormOptions>(opt =>+ {+ opt.MultipartBodyLengthLimit = config.MaxRequestBodySize.Value;+ });++ }+ }+ }+}diff --git a/src/Web/Grand.Web.Common/Grand.Web.Common.csproj b/src/Web/Grand.Web.Common/Grand.Web.Common.csprojindex bdd47ee81..1f69011d1 100644--- a/src/Web/Grand.Web.Common/Grand.Web.Common.csproj+++ b/src/Web/Grand.Web.Common/Grand.Web.Common.csproj@@ -3,14 +3,14 @@<ItemGroup><PackageReference Include="Azure.Extensions.AspNetCore.DataProtection.Blobs" Version="1.3.2" /><PackageReference Include="Azure.Extensions.AspNetCore.DataProtection.Keys" Version="1.2.2" />- <PackageReference Include="Azure.Identity" Version="1.10.3" />+ <PackageReference Include="Azure.Identity" Version="1.10.4" /><PackageReference Include="Flurl.Http" Version="3.2.4" />- <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="6.0.24" />- <PackageReference Include="AspNetCore.HealthChecks.MongoDb" Version="6.0.2" />+ <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="8.0.0" />+ <PackageReference Include="AspNetCore.HealthChecks.MongoDb" Version="7.0.0" /><PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.3.8" /><PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders" Version="0.21.0" />- <PackageReference Include="Wangkanai.Detection" Version="7.4.0" />- <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="6.0.24" />+ <PackageReference Include="Wangkanai.Detection" Version="8.11.0" />+ <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.0" /></ItemGroup><ItemGroup>diff --git a/src/Web/Grand.Web.Vendor/Program.cs b/src/Web/Grand.Web.Vendor/Program.csindex dde13123d..c6d966295 100644--- a/src/Web/Grand.Web.Vendor/Program.cs+++ b/src/Web/Grand.Web.Vendor/Program.cs@@ -1,8 +1,6 @@-using Grand.Infrastructure.Configuration;+using Grand.Web.Common.Extensions;using Grand.Web.Vendor.Extensions;using Microsoft.AspNetCore.Builder;-using Microsoft.AspNetCore.Hosting;-using Microsoft.Extensions.Configuration;using Microsoft.Extensions.DependencyInjection;using Microsoft.Extensions.Hosting;using Serilog;@@ -23,49 +21,12 @@ builder.Host.UseSerilog((context, services, configuration) => configuration.Enrich.FromLogContext());//add configuration-builder.Host.ConfigureAppConfiguration((hostingContext, config) =>-{- config.SetBasePath(hostingContext.HostingEnvironment.ContentRootPath);- config.AddJsonFile("App_Data/appsettings.json", optional: false, reloadOnChange: true);- config.AddEnvironmentVariables();- if (args != null)- {- config.AddCommandLine(args);- var settings = config.Build();- var appsettings = settings["appsettings"];- var param = settings["Directory"];- if (!string.IsNullOrEmpty(appsettings) && !string.IsNullOrEmpty(param))- config.AddJsonFile($"App_Data/{param}/appsettings.json", optional: false, reloadOnChange: true);- }--});+builder.Configuration.AddAppSettingsJsonFile(args);//add servicesGrand.Infrastructure.StartupBase.ConfigureServices(builder.Services, builder.Configuration);-//Allow non ASCII chars in headers-var config = new AppConfig();-builder.Configuration.GetSection("Application").Bind(config);-if (config.AllowNonAsciiCharInHeaders)-{- builder.WebHost.ConfigureKestrel(options =>- {- options.ResponseHeaderEncodingSelector = _ => Encoding.UTF8;- });-}-if (config.MaxRequestBodySize.HasValue)-{- builder.WebHost.ConfigureKestrel(host =>- {- host.Limits.MaxRequestBodySize = config.MaxRequestBodySize.Value;- });-- builder.Services.Configure<Microsoft.AspNetCore.Http.Features.FormOptions>(opt =>- {- opt.MultipartBodyLengthLimit = config.MaxRequestBodySize.Value;- });--}+builder.ConfigureApplicationSettings();if (builder.Environment.IsDevelopment()){diff --git a/src/Web/Grand.Web/Program.cs b/src/Web/Grand.Web/Program.csindex 82c3a26cc..9bc56f009 100644--- a/src/Web/Grand.Web/Program.cs+++ b/src/Web/Grand.Web/Program.cs@@ -1,9 +1,6 @@-using Grand.Infrastructure.Configuration;+using Grand.Web.Common.Extensions;using Grand.Web.Common.Startup;using Microsoft.AspNetCore.Builder;-using Microsoft.AspNetCore.Hosting;-using Microsoft.AspNetCore.Http.Features;-using Microsoft.Extensions.Configuration;using Microsoft.Extensions.DependencyInjection;using Microsoft.Extensions.Hosting;using Serilog;@@ -20,54 +17,18 @@ builder.Host.UseDefaultServiceProvider((_, options) =>builder.Services.AddLogging();//use serilog-builder.Host.UseSerilog((context, services, configuration) => configuration+builder.Host.UseSerilog((context, _, configuration) => configuration.ReadFrom.Configuration(context.Configuration).Enrich.FromLogContext());//add configuration-builder.Host.ConfigureAppConfiguration((hostingContext, config) =>-{- config.SetBasePath(hostingContext.HostingEnvironment.ContentRootPath);- config.AddJsonFile("App_Data/appsettings.json", optional: false, reloadOnChange: true);- config.AddEnvironmentVariables();- if (args != null)- {- config.AddCommandLine(args);- var settings = config.Build();- var appsettings = settings["appsettings"];- var param = settings["Directory"];- if (!string.IsNullOrEmpty(appsettings) && !string.IsNullOrEmpty(param))- config.AddJsonFile($"App_Data/{param}/appsettings.json", optional: false, reloadOnChange: true);- }--});+builder.Configuration.AddAppSettingsJsonFile(args);//add servicesStartupBase.ConfigureServices(builder.Services, builder.Configuration);-//Allow non ASCII chars in headers-var config = new AppConfig();-builder.Configuration.GetSection("Application").Bind(config);-if (config.AllowNonAsciiCharInHeaders)-{- builder.WebHost.ConfigureKestrel(options =>- {- options.ResponseHeaderEncodingSelector = _ => Encoding.UTF8;- });-}-if (config.MaxRequestBodySize.HasValue)-{- builder.WebHost.ConfigureKestrel(host =>- {- host.Limits.MaxRequestBodySize = config.MaxRequestBodySize.Value;- });-- builder.Services.Configure<FormOptions>(opt =>- {- opt.MultipartBodyLengthLimit = config.MaxRequestBodySize.Value;- });+builder.ConfigureApplicationSettings();-}//register taskbuilder.Services.RegisterTasks();