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
Upgrade to ASP.NET CORE 6.0 #178
KrzysztofPajak5a3639c28c5d
diff --git a/Dockerfile b/Dockerfileindex ef5d563f6..a093df187 100644--- a/Dockerfile+++ b/Dockerfile@@ -1,4 +1,4 @@-FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build-env+FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build-envLABEL stage=build-envWORKDIR /app@@ -26,7 +26,7 @@ RUN dotnet build /app/Plugins/Widgets.Slider -c ReleaseRUN dotnet publish /app/Web/Grand.Web -c Release -o ./build/release# Build runtime image-FROM mcr.microsoft.com/dotnet/aspnet:5.0+FROM mcr.microsoft.com/dotnet/aspnet:6.0EXPOSE 80ENV ASPNETCORE_URLS http://+:80WORKDIR /appdiff --git a/src/API/Grand.Api/Grand.Api.csproj b/src/API/Grand.Api/Grand.Api.csprojindex 330cebec6..618a55a07 100644--- a/src/API/Grand.Api/Grand.Api.csproj+++ b/src/API/Grand.Api/Grand.Api.csproj@@ -1,7 +1,7 @@<Project Sdk="Microsoft.NET.Sdk"><PropertyGroup>- <TargetFramework>net5.0</TargetFramework>+ <TargetFramework>net6.0</TargetFramework><Copyright>Copyright © UNIT-SOFT Sp. z o.o.</Copyright><Company>UNIT-SOFT Sp. z o.o.</Company><Authors>UNIT-SOFT Sp. z o.o.</Authors>diff --git a/src/Business/Grand.Business.Authentication/Grand.Business.Authentication.csproj b/src/Business/Grand.Business.Authentication/Grand.Business.Authentication.csprojindex c4abf15df..7a51ff6bb 100644--- a/src/Business/Grand.Business.Authentication/Grand.Business.Authentication.csproj+++ b/src/Business/Grand.Business.Authentication/Grand.Business.Authentication.csproj@@ -1,7 +1,7 @@<Project Sdk="Microsoft.NET.Sdk"><PropertyGroup>- <TargetFramework>net5.0</TargetFramework>+ <TargetFramework>net6.0</TargetFramework><Copyright>Copyright © UNIT-SOFT Sp. z o.o.</Copyright><Company>UNIT-SOFT Sp. z o.o.</Company><Authors>UNIT-SOFT Sp. z o.o.</Authors>diff --git a/src/Business/Grand.Business.Catalog/Grand.Business.Catalog.csproj b/src/Business/Grand.Business.Catalog/Grand.Business.Catalog.csprojindex 844edc80c..c891bdf6d 100644--- a/src/Business/Grand.Business.Catalog/Grand.Business.Catalog.csproj+++ b/src/Business/Grand.Business.Catalog/Grand.Business.Catalog.csproj@@ -1,7 +1,7 @@<Project Sdk="Microsoft.NET.Sdk"><PropertyGroup>- <TargetFramework>net5.0</TargetFramework>+ <TargetFramework>net6.0</TargetFramework><Copyright>Copyright © UNIT-SOFT Sp. z o.o.</Copyright><Company>UNIT-SOFT Sp. z o.o.</Company><Authors>UNIT-SOFT Sp. z o.o.</Authors>diff --git a/src/Business/Grand.Business.Checkout/Grand.Business.Checkout.csproj b/src/Business/Grand.Business.Checkout/Grand.Business.Checkout.csprojindex 42db58444..04271b8d4 100644--- a/src/Business/Grand.Business.Checkout/Grand.Business.Checkout.csproj+++ b/src/Business/Grand.Business.Checkout/Grand.Business.Checkout.csproj@@ -1,7 +1,7 @@<Project Sdk="Microsoft.NET.Sdk"><PropertyGroup>- <TargetFramework>net5.0</TargetFramework>+ <TargetFramework>net6.0</TargetFramework><Copyright>Copyright © UNIT-SOFT Sp. z o.o.</Copyright><Company>UNIT-SOFT Sp. z o.o.</Company><Authors>UNIT-SOFT Sp. z o.o.</Authors>diff --git a/src/Business/Grand.Business.Cms/Grand.Business.Cms.csproj b/src/Business/Grand.Business.Cms/Grand.Business.Cms.csprojindex 445acfc00..acefefd03 100644--- a/src/Business/Grand.Business.Cms/Grand.Business.Cms.csproj+++ b/src/Business/Grand.Business.Cms/Grand.Business.Cms.csproj@@ -1,7 +1,7 @@<Project Sdk="Microsoft.NET.Sdk"><PropertyGroup>- <TargetFramework>net5.0</TargetFramework>+ <TargetFramework>net6.0</TargetFramework><Copyright>Copyright © UNIT-SOFT Sp. z o.o.</Copyright><Company>UNIT-SOFT Sp. z o.o.</Company><Authors>UNIT-SOFT Sp. z o.o.</Authors>diff --git a/src/Business/Grand.Business.Common/Grand.Business.Common.csproj b/src/Business/Grand.Business.Common/Grand.Business.Common.csprojindex 22982ab3d..ff48cdfbc 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"><PropertyGroup>- <TargetFramework>net5.0</TargetFramework>+ <TargetFramework>net6.0</TargetFramework><Copyright>Copyright © UNIT-SOFT Sp. z o.o.</Copyright><Company>UNIT-SOFT Sp. z o.o.</Company><Authors>UNIT-SOFT Sp. z o.o.</Authors>diff --git a/src/Business/Grand.Business.Customers/Grand.Business.Customers.csproj b/src/Business/Grand.Business.Customers/Grand.Business.Customers.csprojindex a73fdcd04..cd6f55079 100644--- a/src/Business/Grand.Business.Customers/Grand.Business.Customers.csproj+++ b/src/Business/Grand.Business.Customers/Grand.Business.Customers.csproj@@ -1,7 +1,7 @@<Project Sdk="Microsoft.NET.Sdk"><PropertyGroup>- <TargetFramework>net5.0</TargetFramework>+ <TargetFramework>net6.0</TargetFramework><Copyright>Copyright © UNIT-SOFT Sp. z o.o.</Copyright><Company>UNIT-SOFT Sp. z o.o.</Company><Authors>UNIT-SOFT Sp. z o.o.</Authors>diff --git a/src/Business/Grand.Business.Marketing/Grand.Business.Marketing.csproj b/src/Business/Grand.Business.Marketing/Grand.Business.Marketing.csprojindex add064782..074ef4694 100644--- a/src/Business/Grand.Business.Marketing/Grand.Business.Marketing.csproj+++ b/src/Business/Grand.Business.Marketing/Grand.Business.Marketing.csproj@@ -1,7 +1,7 @@<Project Sdk="Microsoft.NET.Sdk"><PropertyGroup>- <TargetFramework>net5.0</TargetFramework>+ <TargetFramework>net6.0</TargetFramework><Copyright>Copyright © UNIT-SOFT Sp. z o.o.</Copyright><Company>UNIT-SOFT Sp. z o.o.</Company><Authors>UNIT-SOFT Sp. z o.o.</Authors>diff --git a/src/Business/Grand.Business.Messages/Grand.Business.Messages.csproj b/src/Business/Grand.Business.Messages/Grand.Business.Messages.csprojindex a8751177f..e9d0c4d19 100644--- a/src/Business/Grand.Business.Messages/Grand.Business.Messages.csproj+++ b/src/Business/Grand.Business.Messages/Grand.Business.Messages.csproj@@ -1,7 +1,7 @@<Project Sdk="Microsoft.NET.Sdk"><PropertyGroup>- <TargetFramework>net5.0</TargetFramework>+ <TargetFramework>net6.0</TargetFramework><Copyright>Copyright © UNIT-SOFT Sp. z o.o.</Copyright><Company>UNIT-SOFT Sp. z o.o.</Company><Authors>UNIT-SOFT Sp. z o.o.</Authors>@@ -17,6 +17,6 @@<ProjectReference Include="..\Grand.Business.Storage\Grand.Business.Storage.csproj" /></ItemGroup><ItemGroup>- <PackageReference Include="MailKit" Version="2.15.0" />+ <PackageReference Include="MailKit" Version="3.0.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 93255edc6..3a77c7977 100644--- a/src/Business/Grand.Business.Storage/Grand.Business.Storage.csproj+++ b/src/Business/Grand.Business.Storage/Grand.Business.Storage.csproj@@ -1,7 +1,7 @@<Project Sdk="Microsoft.NET.Sdk"><PropertyGroup>- <TargetFramework>net5.0</TargetFramework>+ <TargetFramework>net6.0</TargetFramework><Copyright>Copyright © UNIT-SOFT Sp. z o.o.</Copyright><Company>UNIT-SOFT Sp. z o.o.</Company><Authors>UNIT-SOFT Sp. z o.o.</Authors>@@ -16,8 +16,8 @@<ProjectReference Include="..\Grand.Business.Common\Grand.Business.Common.csproj" /></ItemGroup><ItemGroup>- <PackageReference Include="AWSSDK.Core" Version="3.7.5.5" />- <PackageReference Include="AWSSDK.S3" Version="3.7.7.2" />+ <PackageReference Include="AWSSDK.Core" Version="3.7.5.8" />+ <PackageReference Include="AWSSDK.S3" Version="3.7.7.5" /><PackageReference Include="Azure.Storage.Blobs" Version="12.10.0" /><PackageReference Include="SkiaSharp" Version="2.80.3" /><PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.80.3" />diff --git a/src/Business/Grand.Business.System/Grand.Business.System.csproj b/src/Business/Grand.Business.System/Grand.Business.System.csprojindex 4c5ce61ea..66c324aa4 100644--- a/src/Business/Grand.Business.System/Grand.Business.System.csproj+++ b/src/Business/Grand.Business.System/Grand.Business.System.csproj@@ -1,7 +1,7 @@<Project Sdk="Microsoft.NET.Sdk"><PropertyGroup>- <TargetFramework>net5.0</TargetFramework>+ <TargetFramework>net6.0</TargetFramework><Copyright>Copyright © UNIT-SOFT Sp. z o.o.</Copyright><Company>UNIT-SOFT Sp. z o.o.</Company><Authors>UNIT-SOFT Sp. z o.o.</Authors>diff --git a/src/Core/Grand.Domain/Grand.Domain.csproj b/src/Core/Grand.Domain/Grand.Domain.csprojindex adfe7c583..78f4d1217 100644--- a/src/Core/Grand.Domain/Grand.Domain.csproj+++ b/src/Core/Grand.Domain/Grand.Domain.csproj@@ -1,7 +1,7 @@<Project Sdk="Microsoft.NET.Sdk"><PropertyGroup>- <TargetFramework>net5.0</TargetFramework>+ <TargetFramework>net6.0</TargetFramework><Copyright>Copyright © UNIT-SOFT Sp. z o.o.</Copyright><Company>UNIT-SOFT Sp. z o.o.</Company><Authors>UNIT-SOFT Sp. z o.o.</Authors>diff --git a/src/Core/Grand.Infrastructure/Grand.Infrastructure.csproj b/src/Core/Grand.Infrastructure/Grand.Infrastructure.csprojindex 20fbe880a..2ea47ed63 100644--- a/src/Core/Grand.Infrastructure/Grand.Infrastructure.csproj+++ b/src/Core/Grand.Infrastructure/Grand.Infrastructure.csproj@@ -1,6 +1,6 @@<Project Sdk="Microsoft.NET.Sdk"><PropertyGroup>- <TargetFramework>net5.0</TargetFramework>+ <TargetFramework>net6.0</TargetFramework><Copyright>Copyright © UNIT-SOFT Sp. z o.o.</Copyright><Company>UNIT-SOFT Sp. z o.o.</Company><Authors>UNIT-SOFT Sp. z o.o.</Authors>@@ -8,15 +8,15 @@<PackageProjectUrl>https://grandnode.com/</PackageProjectUrl></PropertyGroup><ItemGroup>- <PackageReference Include="GoogleAuthenticator" Version="2.3.0" />+ <PackageReference Include="GoogleAuthenticator" Version="2.4.0" /><PackageReference Include="MassTransit.AspNetCore" Version="7.3.0" /><PackageReference Include="MassTransit.RabbitMQ" Version="7.3.0" />- <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.11" />- <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.11" />- <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="5.0.0" />- <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.2" />- <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="5.0.0" />+ <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.1" />+ <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.1" />+ <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.0" />+ <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />+ <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="6.0.0" /><PackageReference Include="AutoMapper" Version="10.1.1" /><PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" /><PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" />@@ -25,8 +25,8 @@<PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="9.0.0" /><PackageReference Include="StackExchange.Redis" Version="2.2.88" /><PackageReference Include="Serilog.AspNetCore" Version="4.1.0" />- <PackageReference Include="FluentValidation" Version="10.3.5" />- <PackageReference Include="FluentValidation.AspNetCore" Version="10.3.5" />+ <PackageReference Include="FluentValidation" Version="10.3.6" />+ <PackageReference Include="FluentValidation.AspNetCore" Version="10.3.6" /><PackageReference Include="Wkhtmltopdf.NetCore" Version="3.0.2" /></ItemGroup><ItemGroup>diff --git a/src/Core/Grand.SharedKernel/Grand.SharedKernel.csproj b/src/Core/Grand.SharedKernel/Grand.SharedKernel.csprojindex 2f002aa33..fff78129b 100644--- a/src/Core/Grand.SharedKernel/Grand.SharedKernel.csproj+++ b/src/Core/Grand.SharedKernel/Grand.SharedKernel.csproj@@ -1,7 +1,7 @@<Project Sdk="Microsoft.NET.Sdk"><PropertyGroup>- <TargetFramework>net5.0</TargetFramework>+ <TargetFramework>net6.0</TargetFramework></PropertyGroup></Project>diff --git a/src/Plugins/Authentication.Facebook/Authentication.Facebook.csproj b/src/Plugins/Authentication.Facebook/Authentication.Facebook.csprojindex 6d5a67228..06fdc70e2 100644--- a/src/Plugins/Authentication.Facebook/Authentication.Facebook.csproj+++ b/src/Plugins/Authentication.Facebook/Authentication.Facebook.csproj@@ -1,7 +1,7 @@<Project Sdk="Microsoft.NET.Sdk.Razor"><PropertyGroup>- <TargetFramework>net5.0</TargetFramework>+ <TargetFramework>net6.0</TargetFramework><Copyright>Copyright © UNIT-SOFT Sp. z o.o.</Copyright><Authors>UNIT-SOFT Sp. z o.o.</Authors><Company>UNIT-SOFT Sp. z o.o.</Company>@@ -25,12 +25,12 @@</Target><ItemGroup>- <PackageReference Include="Microsoft.AspNetCore.Authentication.Facebook" Version="5.0.11" />+ <PackageReference Include="Microsoft.AspNetCore.Authentication.Facebook" Version="6.0.1" /></ItemGroup><Target Name="CopyFile" AfterTargets="AfterBuild"><ItemGroup>- <CopyFiles Include="$(NuGetPackageRoot)\microsoft.aspnetcore.authentication.facebook\5.0.11\lib\net5.0\*.dll" />+ <CopyFiles Include="$(NuGetPackageRoot)\microsoft.aspnetcore.authentication.facebook\6.0.1\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 a6fa03324..04fe0030f 100644--- a/src/Plugins/Authentication.Google/Authentication.Google.csproj+++ b/src/Plugins/Authentication.Google/Authentication.Google.csproj@@ -1,7 +1,7 @@<Project Sdk="Microsoft.NET.Sdk.Razor"><PropertyGroup>- <TargetFramework>net5.0</TargetFramework>+ <TargetFramework>net6.0</TargetFramework><Copyright>Copyright © UNIT-SOFT Sp. z o.o.</Copyright><Authors>UNIT-SOFT Sp. z o.o.</Authors><Company>UNIT-SOFT Sp. z o.o.</Company>@@ -24,12 +24,12 @@</Target><ItemGroup>- <PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="5.0.11" />+ <PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="6.0.1" /></ItemGroup><Target Name="CopyFile" AfterTargets="AfterBuild"><ItemGroup>- <CopyFiles Include="$(NuGetPackageRoot)\microsoft.aspnetcore.authentication.google\5.0.11\lib\net5.0\*.dll" />+ <CopyFiles Include="$(NuGetPackageRoot)\microsoft.aspnetcore.authentication.google\6.0.1\lib\net6.0\*.dll" /></ItemGroup><Copy SourceFiles="@(CopyFiles)" DestinationFolder="..\..\Web\Grand.Web\Plugins\Authentication.Google\" /></Target>diff --git a/src/Plugins/DiscountRules.Standard/DiscountRules.Standard.csproj b/src/Plugins/DiscountRules.Standard/DiscountRules.Standard.csprojindex 728edf3e9..1906b7be3 100644--- a/src/Plugins/DiscountRules.Standard/DiscountRules.Standard.csproj+++ b/src/Plugins/DiscountRules.Standard/DiscountRules.Standard.csproj@@ -1,7 +1,7 @@<Project Sdk="Microsoft.NET.Sdk.Razor"><PropertyGroup>- <TargetFramework>net5.0</TargetFramework>+ <TargetFramework>net6.0</TargetFramework><Copyright>Copyright © UNIT-SOFT Sp. z o.o.</Copyright><Company>UNIT-SOFT Sp. z o.o.</Company><Authors>UNIT-SOFT Sp. z o.o.</Authors>diff --git a/src/Plugins/ExchangeRate.McExchange/ExchangeRate.McExchange.csproj b/src/Plugins/ExchangeRate.McExchange/ExchangeRate.McExchange.csprojindex 68f138101..21d4f0d7d 100644--- a/src/Plugins/ExchangeRate.McExchange/ExchangeRate.McExchange.csproj+++ b/src/Plugins/ExchangeRate.McExchange/ExchangeRate.McExchange.csproj@@ -1,7 +1,7 @@<Project Sdk="Microsoft.NET.Sdk"><PropertyGroup>- <TargetFramework>net5.0</TargetFramework>+ <TargetFramework>net6.0</TargetFramework><Authors>UNIT-SOFT Sp. z o.o.</Authors><Company>UNIT-SOFT Sp. z o.o.</Company><Copyright>Copyright © UNIT-SOFT Sp. z o.o.</Copyright>diff --git a/src/Plugins/Payments.BrainTree/Payments.BrainTree.csproj b/src/Plugins/Payments.BrainTree/Payments.BrainTree.csprojindex 8e1db2711..2dce60d72 100644--- a/src/Plugins/Payments.BrainTree/Payments.BrainTree.csproj+++ b/src/Plugins/Payments.BrainTree/Payments.BrainTree.csproj@@ -1,7 +1,7 @@<Project Sdk="Microsoft.NET.Sdk.Razor"><PropertyGroup>- <TargetFramework>net5.0</TargetFramework>+ <TargetFramework>net6.0</TargetFramework><PackageProjectUrl>https://grandnode.com/</PackageProjectUrl><Company>UNIT-SOFT Sp. z o.o.</Company><AddRazorSupportForMvc>true</AddRazorSupportForMvc>diff --git a/src/Plugins/Payments.CashOnDelivery/Payments.CashOnDelivery.csproj b/src/Plugins/Payments.CashOnDelivery/Payments.CashOnDelivery.csprojindex aec50b337..952784df7 100644--- a/src/Plugins/Payments.CashOnDelivery/Payments.CashOnDelivery.csproj+++ b/src/Plugins/Payments.CashOnDelivery/Payments.CashOnDelivery.csproj@@ -1,7 +1,7 @@<Project Sdk="Microsoft.NET.Sdk.Razor"><PropertyGroup>- <TargetFramework>net5.0</TargetFramework>+ <TargetFramework>net6.0</TargetFramework><Authors>UNIT-SOFT Sp. z o.o.</Authors><Company>UNIT-SOFT Sp. z o.o.</Company><Copyright>Copyright © UNIT-SOFT Sp. z o.o.</Copyright>diff --git a/src/Plugins/Payments.PayPalStandard/Payments.PayPalStandard.csproj b/src/Plugins/Payments.PayPalStandard/Payments.PayPalStandard.csprojindex e31599add..e914498e3 100644--- a/src/Plugins/Payments.PayPalStandard/Payments.PayPalStandard.csproj+++ b/src/Plugins/Payments.PayPalStandard/Payments.PayPalStandard.csproj@@ -1,7 +1,7 @@<Project Sdk="Microsoft.NET.Sdk.Razor"><PropertyGroup>- <TargetFramework>net5.0</TargetFramework>+ <TargetFramework>net6.0</TargetFramework><Copyright>Copyright © UNIT-SOFT Sp. z o.o.</Copyright><Authors>UNIT-SOFT Sp. z o.o.</Authors><Company>UNIT-SOFT Sp. z o.o.</Company>diff --git a/src/Plugins/Shipping.ByWeight/Shipping.ByWeight.csproj b/src/Plugins/Shipping.ByWeight/Shipping.ByWeight.csprojindex 62d4b6025..cf921dad4 100644--- a/src/Plugins/Shipping.ByWeight/Shipping.ByWeight.csproj+++ b/src/Plugins/Shipping.ByWeight/Shipping.ByWeight.csproj@@ -1,7 +1,7 @@<Project Sdk="Microsoft.NET.Sdk.Razor"><PropertyGroup>- <TargetFramework>net5.0</TargetFramework>+ <TargetFramework>net6.0</TargetFramework><Copyright>Copyright © UNIT-SOFT Sp. z o.o.</Copyright><Authors>UNIT-SOFT Sp. z o.o.</Authors><Company>UNIT-SOFT Sp. z o.o.</Company>diff --git a/src/Plugins/Shipping.FixedRateShipping/Shipping.FixedRateShipping.csproj b/src/Plugins/Shipping.FixedRateShipping/Shipping.FixedRateShipping.csprojindex 800c8c4cd..687a4f916 100644--- a/src/Plugins/Shipping.FixedRateShipping/Shipping.FixedRateShipping.csproj+++ b/src/Plugins/Shipping.FixedRateShipping/Shipping.FixedRateShipping.csproj@@ -1,7 +1,7 @@<Project Sdk="Microsoft.NET.Sdk.Razor"><PropertyGroup>- <TargetFramework>net5.0</TargetFramework>+ <TargetFramework>net6.0</TargetFramework><Copyright>Copyright © UNIT-SOFT Sp. z o.o.</Copyright><Authors>UNIT-SOFT Sp. z o.o.</Authors><Company>UNIT-SOFT Sp. z o.o.</Company>diff --git a/src/Plugins/Shipping.ShippingPoint/Shipping.ShippingPoint.csproj b/src/Plugins/Shipping.ShippingPoint/Shipping.ShippingPoint.csprojindex 1be8c1a55..f4ddbecd7 100644--- a/src/Plugins/Shipping.ShippingPoint/Shipping.ShippingPoint.csproj+++ b/src/Plugins/Shipping.ShippingPoint/Shipping.ShippingPoint.csproj@@ -1,7 +1,7 @@<Project Sdk="Microsoft.NET.Sdk.Razor"><PropertyGroup>- <TargetFramework>net5.0</TargetFramework>+ <TargetFramework>net6.0</TargetFramework><Copyright>Copyright © UNIT-SOFT Sp. z o.o.</Copyright><Company>UNIT-SOFT Sp. z o.o.</Company><Authors>UNIT-SOFT Sp. z o.o.</Authors>diff --git a/src/Plugins/Tax.CountryStateZip/Tax.CountryStateZip.csproj b/src/Plugins/Tax.CountryStateZip/Tax.CountryStateZip.csprojindex 8afee6a45..0c416c354 100644--- a/src/Plugins/Tax.CountryStateZip/Tax.CountryStateZip.csproj+++ b/src/Plugins/Tax.CountryStateZip/Tax.CountryStateZip.csproj@@ -1,7 +1,7 @@<Project Sdk="Microsoft.NET.Sdk.Razor"><PropertyGroup>- <TargetFramework>net5.0</TargetFramework>+ <TargetFramework>net6.0</TargetFramework><Copyright>Copyright © UNIT-SOFT Sp. z o.o.</Copyright><Company>UNIT-SOFT Sp. z o.o.</Company><Authors>UNIT-SOFT Sp. z o.o.</Authors>diff --git a/src/Plugins/Tax.FixedRate/Tax.FixedRate.csproj b/src/Plugins/Tax.FixedRate/Tax.FixedRate.csprojindex c3184dba2..a35c4422b 100644--- a/src/Plugins/Tax.FixedRate/Tax.FixedRate.csproj+++ b/src/Plugins/Tax.FixedRate/Tax.FixedRate.csproj@@ -1,7 +1,7 @@<Project Sdk="Microsoft.NET.Sdk.Razor"><PropertyGroup>- <TargetFramework>net5.0</TargetFramework>+ <TargetFramework>net6.0</TargetFramework><Copyright>Copyright © UNIT-SOFT Sp. z o.o.</Copyright><Company>UNIT-SOFT Sp. z o.o.</Company><Authors>UNIT-SOFT Sp. z o.o.</Authors>diff --git a/src/Plugins/Widgets.FacebookPixel/Widgets.FacebookPixel.csproj b/src/Plugins/Widgets.FacebookPixel/Widgets.FacebookPixel.csprojindex 657f0e34b..4258fa492 100644--- a/src/Plugins/Widgets.FacebookPixel/Widgets.FacebookPixel.csproj+++ b/src/Plugins/Widgets.FacebookPixel/Widgets.FacebookPixel.csproj@@ -1,7 +1,7 @@<Project Sdk="Microsoft.NET.Sdk.Razor"><PropertyGroup>- <TargetFramework>net5.0</TargetFramework>+ <TargetFramework>net6.0</TargetFramework><Company>UNIT-SOFT Sp. z o.o.</Company><Authors>UNIT-SOFT Sp. z o.o.</Authors><PackageProjectUrl>https://grandnode.com/</PackageProjectUrl>diff --git a/src/Plugins/Widgets.GoogleAnalytics/Widgets.GoogleAnalytics.csproj b/src/Plugins/Widgets.GoogleAnalytics/Widgets.GoogleAnalytics.csprojindex dbd36ca1f..21c3edb71 100644--- a/src/Plugins/Widgets.GoogleAnalytics/Widgets.GoogleAnalytics.csproj+++ b/src/Plugins/Widgets.GoogleAnalytics/Widgets.GoogleAnalytics.csproj@@ -1,7 +1,7 @@<Project Sdk="Microsoft.NET.Sdk.Razor"><PropertyGroup>- <TargetFramework>net5.0</TargetFramework>+ <TargetFramework>net6.0</TargetFramework><Copyright>Copyright © UNIT-SOFT Sp. z o.o.</Copyright><Company>UNIT-SOFT Sp. z o.o.</Company><Authors>UNIT-SOFT Sp. z o.o.</Authors>diff --git a/src/Plugins/Widgets.Slider/Widgets.Slider.csproj b/src/Plugins/Widgets.Slider/Widgets.Slider.csprojindex e9d403edb..db0a81195 100644--- a/src/Plugins/Widgets.Slider/Widgets.Slider.csproj+++ b/src/Plugins/Widgets.Slider/Widgets.Slider.csproj@@ -1,6 +1,6 @@<Project Sdk="Microsoft.NET.Sdk.Razor"><PropertyGroup>- <TargetFramework>net5.0</TargetFramework>+ <TargetFramework>net6.0</TargetFramework><Copyright>Copyright © UNIT-SOFT Sp. z o.o.</Copyright><Company>UNIT-SOFT Sp. z o.o.</Company><Authors>UNIT-SOFT Sp. z o.o.</Authors>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 2c09442fb..71ff03a94 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@@ -1,7 +1,7 @@<Project Sdk="Microsoft.NET.Sdk"><PropertyGroup>- <TargetFramework>net5.0</TargetFramework>+ <TargetFramework>net6.0</TargetFramework><Copyright>Copyright © UNIT-SOFT Sp. z o.o.</Copyright><Company>UNIT-SOFT Sp. z o.o.</Company><Authors>UNIT-SOFT Sp. z o.o.</Authors>@@ -11,7 +11,7 @@</PropertyGroup><ItemGroup>- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" /><PackageReference Include="Moq" Version="4.16.1" /><PackageReference Include="MSTest.TestAdapter" Version="2.2.8" /><PackageReference Include="MSTest.TestFramework" Version="2.2.8" />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 086299858..30fa93806 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@@ -1,6 +1,6 @@<Project Sdk="Microsoft.NET.Sdk"><PropertyGroup>- <TargetFramework>net5.0</TargetFramework>+ <TargetFramework>net6.0</TargetFramework><Copyright>Copyright © UNIT-SOFT Sp. z o.o.</Copyright><Company>UNIT-SOFT Sp. z o.o.</Company><Authors>UNIT-SOFT Sp. z o.o.</Authors>@@ -10,7 +10,7 @@</PropertyGroup><ItemGroup>- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" /><PackageReference Include="Moq" Version="4.16.1" /><PackageReference Include="MSTest.TestAdapter" Version="2.2.8" /><PackageReference Include="MSTest.TestFramework" Version="2.2.8" />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 386962621..f6b499f24 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@@ -1,13 +1,13 @@<Project Sdk="Microsoft.NET.Sdk"><PropertyGroup>- <TargetFramework>net5.0</TargetFramework>+ <TargetFramework>net6.0</TargetFramework><IsPackable>false</IsPackable></PropertyGroup><ItemGroup>- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" /><PackageReference Include="Moq" Version="4.16.1" /><PackageReference Include="MSTest.TestAdapter" Version="2.2.8" /><PackageReference Include="MSTest.TestFramework" Version="2.2.8" />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 230eb36a8..d946c0c38 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@@ -1,13 +1,13 @@<Project Sdk="Microsoft.NET.Sdk"><PropertyGroup>- <TargetFramework>net5.0</TargetFramework>+ <TargetFramework>net6.0</TargetFramework><IsPackable>false</IsPackable></PropertyGroup><ItemGroup>- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" /><PackageReference Include="Moq" Version="4.16.1" /><PackageReference Include="MSTest.TestAdapter" Version="2.2.8" /><PackageReference Include="MSTest.TestFramework" Version="2.2.8" />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 8bf15775f..30c4f1562 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@@ -1,7 +1,7 @@<Project Sdk="Microsoft.NET.Sdk"><PropertyGroup>- <TargetFramework>net5.0</TargetFramework>+ <TargetFramework>net6.0</TargetFramework><IsPackable>false</IsPackable></PropertyGroup>@@ -16,7 +16,7 @@</ItemGroup><ItemGroup>- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" /><PackageReference Include="Moq" Version="4.16.1" /><PackageReference Include="MSTest.TestAdapter" Version="2.2.8" /><PackageReference Include="MSTest.TestFramework" Version="2.2.8" />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 e4d8cb47d..4fe805dea 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@@ -1,13 +1,13 @@<Project Sdk="Microsoft.NET.Sdk"><PropertyGroup>- <TargetFramework>net5.0</TargetFramework>+ <TargetFramework>net6.0</TargetFramework><IsPackable>false</IsPackable></PropertyGroup><ItemGroup>- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" /><PackageReference Include="Moq" Version="4.16.1" /><PackageReference Include="MSTest.TestAdapter" Version="2.2.8" /><PackageReference Include="MSTest.TestFramework" Version="2.2.8" />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 22e835944..6d98ebf42 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@@ -1,7 +1,7 @@<Project Sdk="Microsoft.NET.Sdk"><PropertyGroup>- <TargetFramework>net5.0</TargetFramework>+ <TargetFramework>net6.0</TargetFramework><IsPackable>false</IsPackable></PropertyGroup>@@ -13,7 +13,7 @@</ItemGroup><ItemGroup>- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" /><PackageReference Include="Moq" Version="4.16.1" /><PackageReference Include="MSTest.TestAdapter" Version="2.2.8" /><PackageReference Include="MSTest.TestFramework" Version="2.2.8" />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 b62099513..8c394884b 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@@ -1,13 +1,13 @@<Project Sdk="Microsoft.NET.Sdk"><PropertyGroup>- <TargetFramework>net5.0</TargetFramework>+ <TargetFramework>net6.0</TargetFramework><IsPackable>false</IsPackable></PropertyGroup><ItemGroup>- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" /><PackageReference Include="Moq" Version="4.16.1" /><PackageReference Include="MSTest.TestAdapter" Version="2.2.8" /><PackageReference Include="MSTest.TestFramework" Version="2.2.8" />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 88ca752f8..0dbf6f6b1 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@@ -1,13 +1,13 @@<Project Sdk="Microsoft.NET.Sdk"><PropertyGroup>- <TargetFramework>net5.0</TargetFramework>+ <TargetFramework>net6.0</TargetFramework><IsPackable>false</IsPackable></PropertyGroup><ItemGroup>- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" /><PackageReference Include="Moq" Version="4.16.1" /><PackageReference Include="MSTest.TestAdapter" Version="2.2.8" /><PackageReference Include="MSTest.TestFramework" Version="2.2.8" />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 cd6ee8f4f..7565d1a48 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@@ -1,13 +1,13 @@<Project Sdk="Microsoft.NET.Sdk"><PropertyGroup>- <TargetFramework>net5.0</TargetFramework>+ <TargetFramework>net6.0</TargetFramework><IsPackable>false</IsPackable></PropertyGroup><ItemGroup>- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" /><PackageReference Include="Moq" Version="4.16.1" /><PackageReference Include="MSTest.TestAdapter" Version="2.2.8" /><PackageReference Include="MSTest.TestFramework" Version="2.2.8" />diff --git a/src/Web/Grand.Web.Admin/Grand.Web.Admin.csproj b/src/Web/Grand.Web.Admin/Grand.Web.Admin.csprojindex 7bbbaea59..f73fc814b 100644--- a/src/Web/Grand.Web.Admin/Grand.Web.Admin.csproj+++ b/src/Web/Grand.Web.Admin/Grand.Web.Admin.csproj@@ -1,7 +1,7 @@<Project Sdk="Microsoft.NET.Sdk.Razor"><PropertyGroup>- <TargetFramework>net5.0</TargetFramework>+ <TargetFramework>net6.0</TargetFramework><Copyright>Copyright © UNIT-SOFT Sp. z o.o.</Copyright><Company>UNIT-SOFT Sp. z o.o.</Company><Authors>UNIT-SOFT Sp. z o.o.</Authors>diff --git a/src/Web/Grand.Web.Common/Grand.Web.Common.csproj b/src/Web/Grand.Web.Common/Grand.Web.Common.csprojindex 47cdd1866..ec5967797 100644--- a/src/Web/Grand.Web.Common/Grand.Web.Common.csproj+++ b/src/Web/Grand.Web.Common/Grand.Web.Common.csproj@@ -1,7 +1,7 @@<Project Sdk="Microsoft.NET.Sdk"><PropertyGroup>- <TargetFramework>net5.0</TargetFramework>+ <TargetFramework>net6.0</TargetFramework><Copyright>Copyright © UNIT-SOFT Sp. z o.o.</Copyright><Company>UNIT-SOFT Sp. z o.o.</Company><Authors>UNIT-SOFT Sp. z o.o.</Authors>@@ -10,15 +10,15 @@</PropertyGroup><ItemGroup>- <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="5.0.11" />- <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="5.0.11" />- <PackageReference Include="AspNetCore.HealthChecks.MongoDb" Version="5.0.1" />+ <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="6.0.1" />+ <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="6.0.1" />+ <PackageReference Include="AspNetCore.HealthChecks.MongoDb" Version="6.0.0" /><PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.2.22" /><PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders" Version="0.16.1" /><PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0" /><PackageReference Include="Wangkanai.Detection" Version="4.0.0" /><PackageReference Include="WebEssentials.AspNetCore.PWA" Version="1.0.65" />- <PackageReference Include="WebMarkupMin.AspNetCore5" Version="2.11.0" />+ <PackageReference Include="WebMarkupMin.AspNetCore6" Version="2.11.0" /><PackageReference Include="WebMarkupMin.Core" Version="2.9.0" /><PackageReference Include="WebMarkupMin.NUglify" Version="2.11.0" /></ItemGroup>diff --git a/src/Web/Grand.Web.Common/Infrastructure/ApplicationBuilderExtensions.cs b/src/Web/Grand.Web.Common/Infrastructure/ApplicationBuilderExtensions.csindex 3bec9fcbf..29d9a20cd 100644--- a/src/Web/Grand.Web.Common/Infrastructure/ApplicationBuilderExtensions.cs+++ b/src/Web/Grand.Web.Common/Infrastructure/ApplicationBuilderExtensions.cs@@ -24,7 +24,7 @@ using Microsoft.Net.Http.Headers;using System;using System.Linq;using System.Threading.Tasks;-using WebMarkupMin.AspNetCore5;+using WebMarkupMin.AspNetCore6;namespace Grand.Web.Common.Infrastructure{diff --git a/src/Web/Grand.Web.Common/Infrastructure/ServiceCollectionExtensions.cs b/src/Web/Grand.Web.Common/Infrastructure/ServiceCollectionExtensions.csindex db6ffe24c..9ff0b27c5 100644--- a/src/Web/Grand.Web.Common/Infrastructure/ServiceCollectionExtensions.cs+++ b/src/Web/Grand.Web.Common/Infrastructure/ServiceCollectionExtensions.cs@@ -34,7 +34,7 @@ using System.Text.Encodings.Web;using System.Text.Unicode;using WebMarkupMin.AspNet.Common.Compressors;using WebMarkupMin.AspNet.Common.UrlMatchers;-using WebMarkupMin.AspNetCore5;+using WebMarkupMin.AspNetCore6;using WebMarkupMin.NUglify;using IWmmLogger = WebMarkupMin.Core.Loggers.ILogger;diff --git a/src/Web/Grand.Web.Common/Routing/GrandRedirectResultExecutor.cs b/src/Web/Grand.Web.Common/Routing/GrandRedirectResultExecutor.csindex a95e60d8b..e408b940d 100644--- a/src/Web/Grand.Web.Common/Routing/GrandRedirectResultExecutor.cs+++ b/src/Web/Grand.Web.Common/Routing/GrandRedirectResultExecutor.cs@@ -47,7 +47,7 @@ namespace Grand.Web.Common.Routing{//passed redirect URL may contain non-ASCII characters, that are not allowed now (see https://github.com/aspnet/KestrelHttpServer/issues/1144)//so we force to encode this URL before processing- result.Url = Uri.EscapeUriString(WebUtility.UrlDecode(result.Url));+ result.Url = Uri.UnescapeDataString(WebUtility.UrlDecode(result.Url));}return base.ExecuteAsync(context, result);diff --git a/src/Web/Grand.Web/Controllers/CommonController.cs b/src/Web/Grand.Web/Controllers/CommonController.csindex dce577793..10919e27d 100644--- a/src/Web/Grand.Web/Controllers/CommonController.cs+++ b/src/Web/Grand.Web/Controllers/CommonController.cs@@ -201,8 +201,7 @@ namespace Grand.Web.Controllersurl = Url.RouteUrl("HomePage");permanentRedirect = false;}-- url = Uri.EscapeUriString(WebUtility.UrlDecode(url));+ url = Uri.UnescapeDataString(WebUtility.UrlDecode(url));if (permanentRedirect)return RedirectPermanent(url);diff --git a/src/Web/Grand.Web/Grand.Web.csproj b/src/Web/Grand.Web/Grand.Web.csprojindex 07d0ff126..aeed3d360 100644--- a/src/Web/Grand.Web/Grand.Web.csproj+++ b/src/Web/Grand.Web/Grand.Web.csproj@@ -1,6 +1,6 @@<Project Sdk="Microsoft.NET.Sdk.Web"><PropertyGroup>- <TargetFramework>net5.0</TargetFramework>+ <TargetFramework>net6.0</TargetFramework><Copyright>Copyright © UNIT-SOFT Sp. z o.o.</Copyright><Company>UNIT-SOFT Sp. z o.o.</Company><Authors>UNIT-SOFT Sp. z o.o.</Authors>@@ -16,7 +16,6 @@<ProjectReference Include="..\..\Core\Grand.Domain\Grand.Domain.csproj" /><ProjectReference Include="..\..\Core\Grand.Infrastructure\Grand.Infrastructure.csproj" /><ProjectReference Include="..\..\Core\Grand.SharedKernel\Grand.SharedKernel.csproj" />-<ProjectReference Include="..\..\Business\Grand.Business.Authentication\Grand.Business.Authentication.csproj" /><ProjectReference Include="..\..\Business\Grand.Business.Catalog\Grand.Business.Catalog.csproj" /><ProjectReference Include="..\..\Business\Grand.Business.Checkout\Grand.Business.Checkout.csproj" />diff --git a/src/Web/Grand.Web/Program.cs b/src/Web/Grand.Web/Program.csindex e3c35c330..d2f033a79 100644--- a/src/Web/Grand.Web/Program.cs+++ b/src/Web/Grand.Web/Program.cs@@ -1,64 +1,51 @@using Grand.Web.Common.Startup;-using Microsoft.AspNetCore.Hosting;+using Microsoft.AspNetCore.Builder;using Microsoft.Extensions.Configuration;using Microsoft.Extensions.Hosting;using Serilog;-using System;-namespace Grand.Web+var builder = WebApplication.CreateBuilder(args);++builder.Host.UseDefaultServiceProvider((context, options) =>{- public class Program- {+ options.ValidateScopes = false;+ options.ValidateOnBuild = false;+});- public static void Main(string[] args)- {- try- {- CreateHostBuilder(args).Build().Run();- }- catch (Exception ex)- {- Log.Fatal(ex, "Host terminated unexpectedly");- }- finally- {- Log.CloseAndFlush();- }- }+//use serilog+builder.Host.UseSerilog();- public static IHostBuilder CreateHostBuilder(string[] args) =>- Host.CreateDefaultBuilder(args)- .UseSerilog()- .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);- }- })- .ConfigureWebHostDefaults(webBuilder =>- {- webBuilder.CaptureStartupErrors(true);- webBuilder.UseStaticWebAssets();- webBuilder.UseSetting(WebHostDefaults.PreventHostingStartupKey, "true");- webBuilder.UseStartup<Startup>();- })- .ConfigureServices(services=>- {- services.RegisterTasks();- })- .UseDefaultServiceProvider((context, options) =>- {- options.ValidateScopes = false;- options.ValidateOnBuild = false;- });+//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);}-}\ No newline at end of file+});++//create logger+Log.Logger = new LoggerConfiguration().ReadFrom.Configuration(builder.Configuration).CreateLogger();++//add services+Grand.Infrastructure.StartupBase.ConfigureServices(builder.Services, builder.Configuration);++//register task+builder.Services.RegisterTasks();++//build app+var app = builder.Build();++//request pipeline+Grand.Infrastructure.StartupBase.ConfigureRequestPipeline(app, builder.Environment);++//run app+app.Run();diff --git a/src/Web/Grand.Web/Startup.cs b/src/Web/Grand.Web/Startup.csdeleted file mode 100644index 908af16b7..000000000--- a/src/Web/Grand.Web/Startup.cs+++ /dev/null@@ -1,56 +0,0 @@-using Microsoft.AspNetCore.Builder;-using Microsoft.AspNetCore.Hosting;-using Microsoft.Extensions.Configuration;-using Microsoft.Extensions.DependencyInjection;-using Serilog;--namespace Grand.Web-{- /// <summary>- /// Represents startup class of application- /// </summary>- public class Startup- {- #region Properties-- /// <summary>- /// Get configuration root of the application- /// </summary>- public IConfiguration Configuration { get; }-- #endregion-- #region Ctor-- public Startup(IConfiguration configuration)- {- Configuration = configuration;-- //create logger- Log.Logger = new LoggerConfiguration()- .ReadFrom.Configuration(Configuration)- .CreateLogger();- }-- #endregion-- /// <summary>- /// Add services to the application and configure service provider- /// </summary>- /// <param name="services">Collection of service descriptors</param>- public void ConfigureServices(IServiceCollection services)- {- Grand.Infrastructure.StartupBase.ConfigureServices(services, Configuration);- }-- /// <summary>- /// Configure the application HTTP request pipeline- /// </summary>- /// <param name="application">Builder for configuring an application's request pipeline</param>- /// <param name="env">IWebHostEnvironment</param>- public void Configure(IApplicationBuilder application, IWebHostEnvironment webHostEnvironment)- {- Grand.Infrastructure.StartupBase.ConfigureRequestPipeline(application, webHostEnvironment);- }- }-}