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
Dotnet9 (#527)
Krzysztof Pajaka754a4a3ccd7
diff --git a/.github/workflows/aspnetcore.yml b/.github/workflows/aspnetcore.ymlindex 751593c2b..add9565bc 100644--- a/.github/workflows/aspnetcore.yml+++ b/.github/workflows/aspnetcore.yml@@ -12,7 +12,7 @@ jobs:- name: Setup .NET Coreuses: actions/setup-dotnet@v4with:- dotnet-version: 8.0.x+ dotnet-version: 9.0.x- name: Restorerun: dotnet restore ./GrandNode.sln- name: Build with dotnetdiff --git a/.github/workflows/grandnode.yml b/.github/workflows/grandnode.ymlindex ee3a279ec..bfb14775b 100644--- a/.github/workflows/grandnode.yml+++ b/.github/workflows/grandnode.yml@@ -17,7 +17,7 @@ jobs:- name: Setup .NET Coreuses: actions/setup-dotnet@v4with:- dotnet-version: 8.0.x+ dotnet-version: 9.0.x- name: Create mongoDB Docker containerrun: sudo docker run -d -p 27017:27017 mongo:latest- name: Restorediff --git a/Directory.Packages.props b/Directory.Packages.propsindex a190fbda9..de7acc506 100644--- a/Directory.Packages.props+++ b/Directory.Packages.props@@ -1,67 +1,68 @@<Project>- <PropertyGroup>- <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>- </PropertyGroup>- <ItemGroup>- <PackageVersion Include="MaxMind.GeoIP2" Version="5.2.0"/>- <PackageVersion Include="ExcelMapper" Version="5.2.483"/>- <PackageVersion Include="Scryber.Core" Version="6.0.4-beta"/>- <PackageVersion Include="Scryber.Core.OpenType" Version="6.1.0-beta"/>- <PackageVersion Include="MailKit" Version="4.8.0"/>- <PackageVersion Include="AWSSDK.Core" Version="3.7.400.40"/>- <PackageVersion Include="AWSSDK.S3" Version="3.7.405.4"/>- <PackageVersion Include="Azure.Storage.Blobs" Version="12.22.2"/>- <PackageVersion Include="SkiaSharp" Version="2.88.8"/>- <PackageVersion Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.8"/>- <PackageVersion Include="LiteDB" Version="5.0.17"/>- <PackageVersion Include="MongoDB.Bson" Version="3.0.0"/>- <PackageVersion Include="MongoDB.Driver" Version="3.0.0"/>- <PackageVersion Include="DotLiquid" Version="2.2.692"/>- <PackageVersion Include="FluentValidation.DependencyInjectionExtensions" Version="11.10.0"/>- <PackageVersion Include="GoogleAuthenticator" Version="3.2.0"/>- <PackageVersion Include="MassTransit" Version="8.3.0"/>- <PackageVersion Include="MassTransit.RabbitMQ" Version="8.3.0"/>- <PackageVersion Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0"/>- <PackageVersion Include="Microsoft.Azure.AppConfiguration.AspNetCore" Version="8.0.0"/>- <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.10"/>- <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1"/>- <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1"/>- <PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="8.0.2"/>- <PackageVersion Include="AutoMapper" Version="13.0.1"/>- <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0"/>- <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.11.0"/>- <PackageVersion Include="MediatR" Version="12.4.1"/>- <PackageVersion Include="Scrutor" Version="5.0.1"/>- <PackageVersion Include="StackExchange.Redis" Version="2.8.16"/>- <PackageVersion Include="FluentValidation" Version="11.10.0"/>- <PackageVersion Include="Microsoft.AspNetCore.JsonPatch" Version="8.0.10"/>- <PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.10"/>- <PackageVersion Include="Microsoft.AspNetCore.OData" Version="9.0.0"/>- <PackageVersion Include="MongoDB.AspNetCore.OData" Version="1.0.1"/>- <PackageVersion Include="Swashbuckle.AspNetCore" Version="6.9.0"/>- <PackageVersion Include="Swashbuckle.AspNetCore.Annotations" Version="6.9.0"/>- <PackageVersion Include="Microsoft.AspNetCore.Authentication.Facebook" Version="8.0.10"/>- <PackageVersion Include="Microsoft.AspNetCore.Authentication.Google" Version="8.0.10"/>- <PackageVersion Include="Braintree" Version="5.27.0"/>- <PackageVersion Include="System.Xml.XPath.XmlDocument" Version="4.3.0"/>- <PackageVersion Include="Stripe.net" Version="46.2.1"/>- <PackageVersion Include="elFinder.Net.AspNetCore" Version="1.5.0"/>- <PackageVersion Include="elFinder.Net.Core" Version="1.5.0"/>- <PackageVersion Include="elFinder.Net.Drivers.FileSystem" Version="1.5.0"/>- <PackageVersion Include="Azure.Extensions.AspNetCore.DataProtection.Blobs" Version="1.3.4"/>- <PackageVersion Include="Azure.Extensions.AspNetCore.DataProtection.Keys" Version="1.2.4"/>- <PackageVersion Include="Azure.Identity" Version="1.13.1"/>- <PackageVersion Include="Flurl.Http" Version="4.0.2"/>- <PackageVersion Include="Microsoft.ApplicationInsights.Profiler.AspNetCore" Version="2.7.2"/>- <PackageVersion Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="8.0.10"/>- <PackageVersion Include="NetEscapades.AspNetCore.SecurityHeaders" Version="0.24.0"/>- <PackageVersion Include="Wangkanai.Detection" Version="8.14.0"/>- <PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.10"/>- <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1"/>- <PackageVersion Include="Moq" Version="4.20.72"/>- <PackageVersion Include="MSTest.TestAdapter" Version="3.6.1"/>- <PackageVersion Include="MSTest.TestFramework" Version="3.6.1"/>- <PackageVersion Include="coverlet.collector" Version="6.0.2"/>- <PackageVersion Include="NUnit" Version="4.2.2"/>- </ItemGroup>+ <PropertyGroup>+ <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>+ </PropertyGroup>+ <ItemGroup>+ <PackageVersion Include="MaxMind.GeoIP2" Version="5.2.0" />+ <PackageVersion Include="ExcelMapper" Version="5.2.593" />+ <PackageVersion Include="NPOI" Version="2.7.2" />+ <PackageVersion Include="Scryber.Core" Version="6.0.4-beta" />+ <PackageVersion Include="Scryber.Core.OpenType" Version="6.1.0-beta" />+ <PackageVersion Include="MailKit" Version="4.8.0" />+ <PackageVersion Include="AWSSDK.Core" Version="3.7.400.57" />+ <PackageVersion Include="AWSSDK.S3" Version="3.7.407.1" />+ <PackageVersion Include="Azure.Storage.Blobs" Version="12.23.0" />+ <PackageVersion Include="SkiaSharp" Version="2.88.9" />+ <PackageVersion Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.9" />+ <PackageVersion Include="LiteDB" Version="5.0.17" />+ <PackageVersion Include="MongoDB.Bson" Version="3.0.0" />+ <PackageVersion Include="MongoDB.Driver" Version="3.0.0" />+ <PackageVersion Include="DotLiquid" Version="2.2.717" />+ <PackageVersion Include="FluentValidation.DependencyInjectionExtensions" Version="11.11.0" />+ <PackageVersion Include="GoogleAuthenticator" Version="3.2.0" />+ <PackageVersion Include="MassTransit" Version="8.3.2" />+ <PackageVersion Include="MassTransit.RabbitMQ" Version="8.3.2" />+ <PackageVersion Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />+ <PackageVersion Include="Microsoft.Azure.AppConfiguration.AspNetCore" Version="8.0.0" />+ <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.0" />+ <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.0" />+ <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />+ <PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="9.0.0" />+ <PackageVersion Include="AutoMapper" Version="13.0.1" />+ <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" />+ <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.11.0" />+ <PackageVersion Include="MediatR" Version="12.4.1" />+ <PackageVersion Include="Scrutor" Version="5.0.2" />+ <PackageVersion Include="StackExchange.Redis" Version="2.8.16" />+ <PackageVersion Include="FluentValidation" Version="11.11.0" />+ <PackageVersion Include="Microsoft.AspNetCore.JsonPatch" Version="9.0.0" />+ <PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="9.0.0" />+ <PackageVersion Include="Microsoft.AspNetCore.OData" Version="9.1.1" />+ <PackageVersion Include="MongoDB.AspNetCore.OData" Version="1.0.1" />+ <PackageVersion Include="Swashbuckle.AspNetCore" Version="7.0.0" />+ <PackageVersion Include="Swashbuckle.AspNetCore.Annotations" Version="7.0.0" />+ <PackageVersion Include="Microsoft.AspNetCore.Authentication.Facebook" Version="9.0.0" />+ <PackageVersion Include="Microsoft.AspNetCore.Authentication.Google" Version="9.0.0" />+ <PackageVersion Include="Braintree" Version="5.28.0" />+ <PackageVersion Include="System.Xml.XPath.XmlDocument" Version="4.7.0" />+ <PackageVersion Include="Stripe.net" Version="47.1.0" />+ <PackageVersion Include="elFinder.Net.AspNetCore" Version="1.5.0" />+ <PackageVersion Include="elFinder.Net.Core" Version="1.5.0" />+ <PackageVersion Include="elFinder.Net.Drivers.FileSystem" Version="1.5.0" />+ <PackageVersion Include="Azure.Extensions.AspNetCore.DataProtection.Blobs" Version="1.3.4" />+ <PackageVersion Include="Azure.Extensions.AspNetCore.DataProtection.Keys" Version="1.2.4" />+ <PackageVersion Include="Azure.Identity" Version="1.13.1" />+ <PackageVersion Include="Flurl.Http" Version="4.0.2" />+ <PackageVersion Include="Microsoft.ApplicationInsights.Profiler.AspNetCore" Version="2.7.2" />+ <PackageVersion Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="9.0.0" />+ <PackageVersion Include="NetEscapades.AspNetCore.SecurityHeaders" Version="0.24.0" />+ <PackageVersion Include="Wangkanai.Detection" Version="8.14.0" />+ <PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="9.0.0" />+ <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />+ <PackageVersion Include="Moq" Version="4.20.72" />+ <PackageVersion Include="MSTest.TestAdapter" Version="3.6.3" />+ <PackageVersion Include="MSTest.TestFramework" Version="3.6.3" />+ <PackageVersion Include="coverlet.collector" Version="6.0.2" />+ <PackageVersion Include="NUnit" Version="4.2.2" />+ </ItemGroup></Project>\ No newline at end of filediff --git a/Dockerfile b/Dockerfileindex 89a2d9c4b..415043435 100644--- a/Dockerfile+++ b/Dockerfile@@ -1,5 +1,5 @@# Build stage-FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env+FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build-envLABEL stage=build-envWORKDIR /app@@ -24,7 +24,8 @@ RUN for plugin in /app/Plugins/*; do \RUN dotnet publish /app/Web/Grand.Web/Grand.Web.csproj -c Release -o ./build/release -p:SourceRevisionId=$GIT_COMMIT -p:GitBranch=$GIT_BRANCH# Runtime stage-FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS runtime+FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS runtime+EXPOSE 8080WORKDIR /appCOPY --from=build-env /app/build/release .diff --git a/azure-pipelines.yml b/azure-pipelines.ymlindex 3b000acd9..7ba85cf58 100644--- a/azure-pipelines.yml+++ b/azure-pipelines.yml@@ -27,7 +27,7 @@ steps:- task: UseDotNet@2displayName: 'Install .NET Core SDK 8'inputs:- version: '8.0.x'+ version: '9.0.x'- task: NuGetToolInstaller@1displayName: 'Install NuGet >=6.3.0-0'diff --git a/global.json b/global.jsonindex 6c5cf46a5..41c9ad2ed 100644--- a/global.json+++ b/global.json@@ -1,7 +1,7 @@{"sdk": {- "version": "8.0.101",+ "version": "9.0.100","rollForward": "latestFeature","allowPrerelease": false}-}\ No newline at end of file+}diff --git a/src/Build/Grand.Common.props b/src/Build/Grand.Common.propsindex 3e292e8ab..c950b7cab 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>net8.0</TargetFramework>+ <TargetFramework>net9.0</TargetFramework></PropertyGroup><PropertyGroup><Product>grandnode</Product>diff --git a/src/Business/Grand.Business.Authentication/Startup/StartupApplication.cs b/src/Business/Grand.Business.Authentication/Startup/StartupApplication.csindex 3cf110d00..59efd1205 100644--- a/src/Business/Grand.Business.Authentication/Startup/StartupApplication.cs+++ b/src/Business/Grand.Business.Authentication/Startup/StartupApplication.cs@@ -21,8 +21,8 @@ public class StartupApplication : IStartupApplicationservices.AddScoped<IRefreshTokenService, RefreshTokenService>();}- public void Configure(IApplicationBuilder application, IWebHostEnvironment webHostEnvironment)- {+ public void Configure(WebApplication application, IWebHostEnvironment webHostEnvironment)+ {}public int Priority => 100;diff --git a/src/Business/Grand.Business.Catalog/Startup/StartupApplication.cs b/src/Business/Grand.Business.Catalog/Startup/StartupApplication.csindex a530fa153..ad34e2d36 100644--- a/src/Business/Grand.Business.Catalog/Startup/StartupApplication.cs+++ b/src/Business/Grand.Business.Catalog/Startup/StartupApplication.cs@@ -37,7 +37,7 @@ public class StartupApplication : IStartupApplicationRegisterExportImport(services);}- public void Configure(IApplicationBuilder application, IWebHostEnvironment webHostEnvironment)+ public void Configure(WebApplication application, IWebHostEnvironment webHostEnvironment){}diff --git a/src/Business/Grand.Business.Checkout/Startup/StartupApplication.cs b/src/Business/Grand.Business.Checkout/Startup/StartupApplication.csindex b48043fb4..7e6ee4a2c 100644--- a/src/Business/Grand.Business.Checkout/Startup/StartupApplication.cs+++ b/src/Business/Grand.Business.Checkout/Startup/StartupApplication.cs@@ -30,7 +30,7 @@ public class StartupApplication : IStartupApplicationRegisterExportImport(services);}- public void Configure(IApplicationBuilder application, IWebHostEnvironment webHostEnvironment)+ public void Configure(WebApplication application, IWebHostEnvironment webHostEnvironment){}diff --git a/src/Business/Grand.Business.Cms/Startup/StartupApplication.cs b/src/Business/Grand.Business.Cms/Startup/StartupApplication.csindex 761a32c74..714aa4346 100644--- a/src/Business/Grand.Business.Cms/Startup/StartupApplication.cs+++ b/src/Business/Grand.Business.Cms/Startup/StartupApplication.cs@@ -22,7 +22,7 @@ public class StartupApplication : IStartupApplicationservices.AddScoped<IRobotsTxtService, RobotsTxtService>();}- public void Configure(IApplicationBuilder application, IWebHostEnvironment webHostEnvironment)+ public void Configure(WebApplication application, IWebHostEnvironment webHostEnvironment){}diff --git a/src/Business/Grand.Business.Common/Grand.Business.Common.csproj b/src/Business/Grand.Business.Common/Grand.Business.Common.csprojindex ab12e5942..5b649a90d 100644--- a/src/Business/Grand.Business.Common/Grand.Business.Common.csproj+++ b/src/Business/Grand.Business.Common/Grand.Business.Common.csproj@@ -2,6 +2,7 @@<Import Project="..\..\Build\Grand.Common.props" /><ItemGroup><PackageReference Include="ExcelMapper" />+ <PackageReference Include="NPOI" /><PackageReference Include="Scryber.Core" /><PackageReference Include="Scryber.Core.OpenType" /></ItemGroup>diff --git a/src/Business/Grand.Business.Common/Startup/StartupApplication.cs b/src/Business/Grand.Business.Common/Startup/StartupApplication.csindex 8ee19bd76..824f9d488 100644--- a/src/Business/Grand.Business.Common/Startup/StartupApplication.cs+++ b/src/Business/Grand.Business.Common/Startup/StartupApplication.cs@@ -39,7 +39,7 @@ public class StartupApplication : IStartupApplicationRegisterExportImportService(services);}- public void Configure(IApplicationBuilder application, IWebHostEnvironment webHostEnvironment)+ public void Configure(WebApplication application, IWebHostEnvironment webHostEnvironment){}diff --git a/src/Business/Grand.Business.Customers/Startup/StartupApplication.cs b/src/Business/Grand.Business.Customers/Startup/StartupApplication.csindex 6014744c0..9179141ca 100644--- a/src/Business/Grand.Business.Customers/Startup/StartupApplication.cs+++ b/src/Business/Grand.Business.Customers/Startup/StartupApplication.cs@@ -20,7 +20,7 @@ public class StartupApplication : IStartupApplicationRegisterCustomerService(services);}- public void Configure(IApplicationBuilder application, IWebHostEnvironment webHostEnvironment)+ public void Configure(WebApplication application, IWebHostEnvironment webHostEnvironment){}diff --git a/src/Business/Grand.Business.Marketing/Startup/StartupApplication.cs b/src/Business/Grand.Business.Marketing/Startup/StartupApplication.csindex 70a329a3a..4caa13fe5 100644--- a/src/Business/Grand.Business.Marketing/Startup/StartupApplication.cs+++ b/src/Business/Grand.Business.Marketing/Startup/StartupApplication.cs@@ -30,7 +30,7 @@ public class StartupApplication : IStartupApplicationRegisterCustomer(services);}- public void Configure(IApplicationBuilder application, IWebHostEnvironment webHostEnvironment)+ public void Configure(WebApplication application, IWebHostEnvironment webHostEnvironment){}diff --git a/src/Business/Grand.Business.Messages/Startup/StartupApplication.cs b/src/Business/Grand.Business.Messages/Startup/StartupApplication.csindex 2c9a942d6..adf4cd445 100644--- a/src/Business/Grand.Business.Messages/Startup/StartupApplication.cs+++ b/src/Business/Grand.Business.Messages/Startup/StartupApplication.cs@@ -26,7 +26,7 @@ public class StartupApplication : IStartupApplication});}- public void Configure(IApplicationBuilder application, IWebHostEnvironment webHostEnvironment)+ public void Configure(WebApplication application, IWebHostEnvironment webHostEnvironment){}diff --git a/src/Business/Grand.Business.Storage/Startup/StartupApplication.cs b/src/Business/Grand.Business.Storage/Startup/StartupApplication.csindex ea9e503db..7efcf882a 100644--- a/src/Business/Grand.Business.Storage/Startup/StartupApplication.cs+++ b/src/Business/Grand.Business.Storage/Startup/StartupApplication.cs@@ -48,7 +48,7 @@ public class StartupApplication : IStartupApplication});}- public void Configure(IApplicationBuilder application, IWebHostEnvironment webHostEnvironment)+ public void Configure(WebApplication application, IWebHostEnvironment webHostEnvironment){}diff --git a/src/Core/Grand.Infrastructure/IStartupApplication.cs b/src/Core/Grand.Infrastructure/IStartupApplication.csindex 97ae79f52..d2f05ddf0 100644--- a/src/Core/Grand.Infrastructure/IStartupApplication.cs+++ b/src/Core/Grand.Infrastructure/IStartupApplication.cs@@ -29,5 +29,5 @@ public interface IStartupApplication/// </summary>/// <param name="application">Builder for configuring an application's request pipeline</param>/// <param name="webHostEnvironment">WebHostEnvironment</param>- void Configure(IApplicationBuilder application, IWebHostEnvironment webHostEnvironment);+ void Configure(WebApplication application, IWebHostEnvironment webHostEnvironment);}\ No newline at end of filediff --git a/src/Core/Grand.Infrastructure/Startup/StartupApplication.cs b/src/Core/Grand.Infrastructure/Startup/StartupApplication.csindex 07cac0ad7..6ff52c510 100644--- a/src/Core/Grand.Infrastructure/Startup/StartupApplication.cs+++ b/src/Core/Grand.Infrastructure/Startup/StartupApplication.cs@@ -18,7 +18,7 @@ public class StartupApplication : IStartupApplicationpublic bool BeforeConfigure => false;- public void Configure(IApplicationBuilder application, IWebHostEnvironment webHostEnvironment)+ public void Configure(WebApplication application, IWebHostEnvironment webHostEnvironment){}diff --git a/src/Core/Grand.Infrastructure/StartupBase.cs b/src/Core/Grand.Infrastructure/StartupBase.csindex 16da74a60..6e04b72f6 100644--- a/src/Core/Grand.Infrastructure/StartupBase.cs+++ b/src/Core/Grand.Infrastructure/StartupBase.cs@@ -331,7 +331,7 @@ public static class StartupBase/// </summary>/// <param name="application">Builder for configuring an application's request pipeline</param>/// <param name="webHostEnvironment">WebHostEnvironment</param>- public static void ConfigureRequestPipeline(IApplicationBuilder application,+ public static void ConfigureRequestPipeline(WebApplication application,IWebHostEnvironment webHostEnvironment){//find startup configurations provided by other assembliesdiff --git a/src/Modules/Grand.Module.Api/Infrastructure/ApiProviderStartup.cs b/src/Modules/Grand.Module.Api/Infrastructure/ApiProviderStartup.csindex 272bf7d5b..87430c0dc 100644--- a/src/Modules/Grand.Module.Api/Infrastructure/ApiProviderStartup.cs+++ b/src/Modules/Grand.Module.Api/Infrastructure/ApiProviderStartup.cs@@ -31,7 +31,7 @@ public class ApiProviderStartup : IStartupApplication/// </summary>/// <param name="application">Builder for configuring an application's request pipeline</param>/// <param name="webHostEnvironment">WebHostEnvironment</param>- public void Configure(IApplicationBuilder application, IWebHostEnvironment webHostEnvironment)+ public void Configure(WebApplication application, IWebHostEnvironment webHostEnvironment){}diff --git a/src/Modules/Grand.Module.Api/Infrastructure/ODataStartup.cs b/src/Modules/Grand.Module.Api/Infrastructure/ODataStartup.csindex 05bcdd7f1..208da7bca 100644--- a/src/Modules/Grand.Module.Api/Infrastructure/ODataStartup.cs+++ b/src/Modules/Grand.Module.Api/Infrastructure/ODataStartup.cs@@ -33,9 +33,9 @@ namespace Grand.Module.Api.Infrastructure;public class ODataStartup : IStartupApplication{- public void Configure(IApplicationBuilder application, IWebHostEnvironment webHostEnvironment)+ public void Configure(WebApplication application, IWebHostEnvironment webHostEnvironment){- var apiConfig = application.ApplicationServices.GetService<BackendAPIConfig>();+ var apiConfig = application.Services.GetService<BackendAPIConfig>();if (apiConfig.Enabled) application.UseCors(Configurations.CorsPolicyName);}diff --git a/src/Modules/Grand.Module.Api/Infrastructure/SwaggerStartup.cs b/src/Modules/Grand.Module.Api/Infrastructure/SwaggerStartup.csindex 3f49fca5b..a7ec1e541 100644--- a/src/Modules/Grand.Module.Api/Infrastructure/SwaggerStartup.cs+++ b/src/Modules/Grand.Module.Api/Infrastructure/SwaggerStartup.cs@@ -14,11 +14,11 @@ namespace Grand.Module.Api.Infrastructure;public class SwaggerStartup : IStartupApplication{- public void Configure(IApplicationBuilder application, IWebHostEnvironment webHostEnvironment)+ public void Configure(WebApplication application, IWebHostEnvironment webHostEnvironment){- var backendApiConfig = application.ApplicationServices.GetService<BackendAPIConfig>();- var frontApiConfig = application.ApplicationServices.GetService<FrontendAPIConfig>();- var swagger = application.ApplicationServices.GetService<IConfiguration>().GetValue<bool>("UseSwagger");+ var backendApiConfig = application.Services.GetService<BackendAPIConfig>();+ var frontApiConfig = application.Services.GetService<FrontendAPIConfig>();+ var swagger = application.Services.GetService<IConfiguration>().GetValue<bool>("UseSwagger");if (backendApiConfig.Enabled)application.UseODataQueryRequest();diff --git a/src/Modules/Grand.Module.Installer/Startup/StartupApplication.cs b/src/Modules/Grand.Module.Installer/Startup/StartupApplication.csindex 07608fb91..132744ee9 100644--- a/src/Modules/Grand.Module.Installer/Startup/StartupApplication.cs+++ b/src/Modules/Grand.Module.Installer/Startup/StartupApplication.cs@@ -16,7 +16,7 @@ public class StartupApplication : IStartupApplicationRegisterInstallService(services);}- public void Configure(IApplicationBuilder application, IWebHostEnvironment webHostEnvironment)+ public void Configure(WebApplication application, IWebHostEnvironment webHostEnvironment){}diff --git a/src/Modules/Grand.Module.Migration/Startup/StartupApplication.cs b/src/Modules/Grand.Module.Migration/Startup/StartupApplication.csindex 37eb1fca5..194a89e5b 100644--- a/src/Modules/Grand.Module.Migration/Startup/StartupApplication.cs+++ b/src/Modules/Grand.Module.Migration/Startup/StartupApplication.cs@@ -17,16 +17,15 @@ public class StartupApplication : IStartupApplicationservices.AddScoped<IMigrationProcess, MigrationProcess>();}- public void Configure(IApplicationBuilder application, IWebHostEnvironment webHostEnvironment)+ public void Configure(WebApplication application, IWebHostEnvironment webHostEnvironment){if (!DataSettingsManager.DatabaseIsInstalled())return;- var serviceProvider = application.ApplicationServices;- var featureFlagsConfig = serviceProvider.GetRequiredService<FeatureFlagsConfig>();+ var featureFlagsConfig = application.Services.GetRequiredService<FeatureFlagsConfig>();if (featureFlagsConfig.Modules.TryGetValue("Grand.Module.Migration", out var value) && value){- var migrationProcess = serviceProvider.GetRequiredService<IMigrationProcess>();+ var migrationProcess = application.Services.GetRequiredService<IMigrationProcess>();migrationProcess.RunMigrationProcess();}}diff --git a/src/Modules/Grand.Module.ScheduledTasks/Startup/StartupApplication.cs b/src/Modules/Grand.Module.ScheduledTasks/Startup/StartupApplication.csindex cd0191149..d0741d68d 100644--- a/src/Modules/Grand.Module.ScheduledTasks/Startup/StartupApplication.cs+++ b/src/Modules/Grand.Module.ScheduledTasks/Startup/StartupApplication.cs@@ -15,7 +15,7 @@ public class StartupApplication : IStartupApplicationRegisterTask(services);}- public void Configure(IApplicationBuilder application, IWebHostEnvironment webHostEnvironment)+ public void Configure(WebApplication application, IWebHostEnvironment webHostEnvironment){}diff --git a/src/Plugins/Authentication.Facebook/Authentication.Facebook.csproj b/src/Plugins/Authentication.Facebook/Authentication.Facebook.csprojindex 50944f72c..18bf655a4 100644--- a/src/Plugins/Authentication.Facebook/Authentication.Facebook.csproj+++ b/src/Plugins/Authentication.Facebook/Authentication.Facebook.csproj@@ -20,7 +20,7 @@<Target Name="CopyFile" AfterTargets="AfterBuild"><ItemGroup>- <CopyFiles Include="$(NuGetPackageRoot)\microsoft.aspnetcore.authentication.facebook\8.0.10\lib\net8.0\*.dll" />+ <CopyFiles Include="$(NuGetPackageRoot)\microsoft.aspnetcore.authentication.facebook\9.0.0\lib\net9.0\*.dll" /></ItemGroup><Copy SourceFiles="@(CopyFiles)" DestinationFolder="..\..\Web\Grand.Web\Plugins\Authentication.Facebook\" /></Target>diff --git a/src/Plugins/Authentication.Facebook/Infrastructure/StartupApplication.cs b/src/Plugins/Authentication.Facebook/Infrastructure/StartupApplication.csindex 7805312ac..2952f7a46 100644--- a/src/Plugins/Authentication.Facebook/Infrastructure/StartupApplication.cs+++ b/src/Plugins/Authentication.Facebook/Infrastructure/StartupApplication.cs@@ -16,7 +16,7 @@ public class StartupApplication : IStartupApplicationpublic int Priority => 10;- public void Configure(IApplicationBuilder application, IWebHostEnvironment webHostEnvironment)+ public void Configure(WebApplication application, IWebHostEnvironment webHostEnvironment){}diff --git a/src/Plugins/Authentication.Google/Authentication.Google.csproj b/src/Plugins/Authentication.Google/Authentication.Google.csprojindex 52b894297..c98cfe0e2 100644--- a/src/Plugins/Authentication.Google/Authentication.Google.csproj+++ b/src/Plugins/Authentication.Google/Authentication.Google.csproj@@ -19,7 +19,7 @@<Target Name="CopyFile" AfterTargets="AfterBuild"><ItemGroup>- <CopyFiles Include="$(NuGetPackageRoot)\microsoft.aspnetcore.authentication.google\8.0.10\lib\net8.0\*.dll" />+ <CopyFiles Include="$(NuGetPackageRoot)\microsoft.aspnetcore.authentication.google\9.0.0\lib\net9.0\*.dll" /></ItemGroup><Copy SourceFiles="@(CopyFiles)" DestinationFolder="..\..\Web\Grand.Web\Plugins\Authentication.Google\" /></Target>diff --git a/src/Plugins/Authentication.Google/Infrastructure/StartupApplication.cs b/src/Plugins/Authentication.Google/Infrastructure/StartupApplication.csindex 53cb41b09..91cf4de7b 100644--- a/src/Plugins/Authentication.Google/Infrastructure/StartupApplication.cs+++ b/src/Plugins/Authentication.Google/Infrastructure/StartupApplication.cs@@ -16,7 +16,7 @@ public class StartupApplication : IStartupApplicationpublic int Priority => 10;- public void Configure(IApplicationBuilder application, IWebHostEnvironment webHostEnvironment)+ public void Configure(WebApplication application, IWebHostEnvironment webHostEnvironment){}diff --git a/src/Plugins/DiscountRules.Standard/StartupApplication.cs b/src/Plugins/DiscountRules.Standard/StartupApplication.csindex 718adfca7..f600e7b43 100644--- a/src/Plugins/DiscountRules.Standard/StartupApplication.cs+++ b/src/Plugins/DiscountRules.Standard/StartupApplication.cs@@ -22,7 +22,7 @@ public class StartupApplication : IStartupApplicationpublic int Priority => 10;- public void Configure(IApplicationBuilder application, IWebHostEnvironment webHostEnvironment)+ public void Configure(WebApplication application, IWebHostEnvironment webHostEnvironment){}diff --git a/src/Plugins/ExchangeRate.McExchange/StartupApplication.cs b/src/Plugins/ExchangeRate.McExchange/StartupApplication.csindex 128cd7968..4e10fc3fa 100644--- a/src/Plugins/ExchangeRate.McExchange/StartupApplication.cs+++ b/src/Plugins/ExchangeRate.McExchange/StartupApplication.cs@@ -16,7 +16,7 @@ public class StartupApplication : IStartupApplicationpublic int Priority => 10;- public void Configure(IApplicationBuilder application, IWebHostEnvironment webHostEnvironment)+ public void Configure(WebApplication application, IWebHostEnvironment webHostEnvironment){}diff --git a/src/Plugins/Payments.BrainTree/Payments.BrainTree.csproj b/src/Plugins/Payments.BrainTree/Payments.BrainTree.csprojindex b0f0874b1..e05ebad1c 100644--- a/src/Plugins/Payments.BrainTree/Payments.BrainTree.csproj+++ b/src/Plugins/Payments.BrainTree/Payments.BrainTree.csproj@@ -21,8 +21,8 @@<Target Name="CopyFile" AfterTargets="AfterBuild"><ItemGroup>- <CopyFiles Include="$(NuGetPackageRoot)\braintree\5.27.0\lib\netstandard2.0\*.*" />- <CopyFiles Include="$(NuGetPackageRoot)\system.xml.xpath.xmldocument\4.3.0\lib\netstandard1.3\*.*" />+ <CopyFiles Include="$(NuGetPackageRoot)\braintree\5.28.0\lib\netstandard2.0\*.*" />+ <CopyFiles Include="$(NuGetPackageRoot)\system.xml.xpath.xmldocument\4.7.0\lib\netstandard2.0\*.*" /></ItemGroup><Copy SourceFiles="@(CopyFiles)" DestinationFolder="..\..\Web\Grand.Web\Plugins\Payments.BrainTree\" /></Target>diff --git a/src/Plugins/Payments.BrainTree/StartupApplication.cs b/src/Plugins/Payments.BrainTree/StartupApplication.csindex bcf458c5e..4bbe08021 100644--- a/src/Plugins/Payments.BrainTree/StartupApplication.cs+++ b/src/Plugins/Payments.BrainTree/StartupApplication.cs@@ -18,7 +18,7 @@ public class StartupApplication : IStartupApplicationpublic int Priority => 10;- public void Configure(IApplicationBuilder application, IWebHostEnvironment webHostEnvironment)+ public void Configure(WebApplication application, IWebHostEnvironment webHostEnvironment){}diff --git a/src/Plugins/Payments.CashOnDelivery/StartupApplication.cs b/src/Plugins/Payments.CashOnDelivery/StartupApplication.csindex 33aa8f03c..8e41c793a 100644--- a/src/Plugins/Payments.CashOnDelivery/StartupApplication.cs+++ b/src/Plugins/Payments.CashOnDelivery/StartupApplication.cs@@ -16,7 +16,7 @@ public class StartupApplication : IStartupApplicationpublic int Priority => 10;- public void Configure(IApplicationBuilder application, IWebHostEnvironment webHostEnvironment)+ public void Configure(WebApplication application, IWebHostEnvironment webHostEnvironment){}diff --git a/src/Plugins/Payments.StripeCheckout/Payments.StripeCheckout.csproj b/src/Plugins/Payments.StripeCheckout/Payments.StripeCheckout.csprojindex 967d46688..8bd9f9c7c 100644--- a/src/Plugins/Payments.StripeCheckout/Payments.StripeCheckout.csproj+++ b/src/Plugins/Payments.StripeCheckout/Payments.StripeCheckout.csproj@@ -20,7 +20,7 @@<Target Name="CopyFile" AfterTargets="AfterBuild"><ItemGroup>- <CopyFiles Include="$(NuGetPackageRoot)\stripe.net\46.2.1\lib\net6.0\*.*" />+ <CopyFiles Include="$(NuGetPackageRoot)\stripe.net\47.1.0\lib\net8.0\*.*" /></ItemGroup><Copy SourceFiles="@(CopyFiles)" DestinationFolder="..\..\Web\Grand.Web\Plugins\Payments.StripeCheckout\" /></Target>diff --git a/src/Plugins/Payments.StripeCheckout/StartupApplication.cs b/src/Plugins/Payments.StripeCheckout/StartupApplication.csindex d1706ab64..48488c937 100644--- a/src/Plugins/Payments.StripeCheckout/StartupApplication.cs+++ b/src/Plugins/Payments.StripeCheckout/StartupApplication.cs@@ -18,7 +18,7 @@ public class StartupApplication : IStartupApplicationpublic int Priority => 10;- public void Configure(IApplicationBuilder application, IWebHostEnvironment webHostEnvironment)+ public void Configure(WebApplication application, IWebHostEnvironment webHostEnvironment){}diff --git a/src/Plugins/Shipping.ByWeight/StartupApplication.cs b/src/Plugins/Shipping.ByWeight/StartupApplication.csindex caf930020..af7a61a50 100644--- a/src/Plugins/Shipping.ByWeight/StartupApplication.cs+++ b/src/Plugins/Shipping.ByWeight/StartupApplication.cs@@ -18,7 +18,7 @@ public class StartupApplication : IStartupApplicationpublic int Priority => 10;- public void Configure(IApplicationBuilder application, IWebHostEnvironment webHostEnvironment)+ public void Configure(WebApplication application, IWebHostEnvironment webHostEnvironment){}diff --git a/src/Plugins/Shipping.FixedRateShipping/StartupApplication.cs b/src/Plugins/Shipping.FixedRateShipping/StartupApplication.csindex 2b9ff384c..26f858cfa 100644--- a/src/Plugins/Shipping.FixedRateShipping/StartupApplication.cs+++ b/src/Plugins/Shipping.FixedRateShipping/StartupApplication.cs@@ -16,7 +16,7 @@ public class StartupApplication : IStartupApplicationpublic int Priority => 10;- public void Configure(IApplicationBuilder application, IWebHostEnvironment webHostEnvironment)+ public void Configure(WebApplication application, IWebHostEnvironment webHostEnvironment){}diff --git a/src/Plugins/Shipping.ShippingPoint/StartupApplication.cs b/src/Plugins/Shipping.ShippingPoint/StartupApplication.csindex 5659d28b0..0d3ed2da1 100644--- a/src/Plugins/Shipping.ShippingPoint/StartupApplication.cs+++ b/src/Plugins/Shipping.ShippingPoint/StartupApplication.cs@@ -18,7 +18,7 @@ public class StartupApplication : IStartupApplicationpublic int Priority => 10;- public void Configure(IApplicationBuilder application, IWebHostEnvironment webHostEnvironment)+ public void Configure(WebApplication application, IWebHostEnvironment webHostEnvironment){}diff --git a/src/Plugins/Tax.CountryStateZip/StartupApplication.cs b/src/Plugins/Tax.CountryStateZip/StartupApplication.csindex 321f8ac6f..7628d5ae9 100644--- a/src/Plugins/Tax.CountryStateZip/StartupApplication.cs+++ b/src/Plugins/Tax.CountryStateZip/StartupApplication.cs@@ -18,7 +18,7 @@ public class StartupApplication : IStartupApplicationpublic int Priority => 20;- public void Configure(IApplicationBuilder application, IWebHostEnvironment webHostEnvironment)+ public void Configure(WebApplication application, IWebHostEnvironment webHostEnvironment){}diff --git a/src/Plugins/Tax.FixedRate/StartupApplication.cs b/src/Plugins/Tax.FixedRate/StartupApplication.csindex d803b83e0..1c9e2824b 100644--- a/src/Plugins/Tax.FixedRate/StartupApplication.cs+++ b/src/Plugins/Tax.FixedRate/StartupApplication.cs@@ -16,7 +16,7 @@ public class StartupApplication : IStartupApplicationpublic int Priority => 10;- public void Configure(IApplicationBuilder application, IWebHostEnvironment webHostEnvironment)+ public void Configure(WebApplication application, IWebHostEnvironment webHostEnvironment){}diff --git a/src/Plugins/Theme.Modern/StartupApplication.cs b/src/Plugins/Theme.Modern/StartupApplication.csindex a362b7cd4..8c9f5c2cc 100644--- a/src/Plugins/Theme.Modern/StartupApplication.cs+++ b/src/Plugins/Theme.Modern/StartupApplication.cs@@ -16,7 +16,7 @@ public class StartupApplication : IStartupApplicationpublic int Priority => 10;- public void Configure(IApplicationBuilder application, IWebHostEnvironment webHostEnvironment)+ public void Configure(WebApplication application, IWebHostEnvironment webHostEnvironment){}diff --git a/src/Plugins/Widgets.FacebookPixel/StartupApplication.cs b/src/Plugins/Widgets.FacebookPixel/StartupApplication.csindex df381b5c0..2a05fcbea 100644--- a/src/Plugins/Widgets.FacebookPixel/StartupApplication.cs+++ b/src/Plugins/Widgets.FacebookPixel/StartupApplication.cs@@ -17,7 +17,7 @@ public class StartupApplication : IStartupApplicationpublic int Priority => 10;- public void Configure(IApplicationBuilder application, IWebHostEnvironment webHostEnvironment)+ public void Configure(WebApplication application, IWebHostEnvironment webHostEnvironment){}diff --git a/src/Plugins/Widgets.GoogleAnalytics/StartupApplication.cs b/src/Plugins/Widgets.GoogleAnalytics/StartupApplication.csindex 4e64f76bd..8591bab57 100644--- a/src/Plugins/Widgets.GoogleAnalytics/StartupApplication.cs+++ b/src/Plugins/Widgets.GoogleAnalytics/StartupApplication.cs@@ -17,7 +17,7 @@ public class StartupApplication : IStartupApplicationpublic int Priority => 10;- public void Configure(IApplicationBuilder application, IWebHostEnvironment webHostEnvironment)+ public void Configure(WebApplication application, IWebHostEnvironment webHostEnvironment){}diff --git a/src/Plugins/Widgets.Slider/StartupApplication.cs b/src/Plugins/Widgets.Slider/StartupApplication.csindex fbe49b1c6..89f3722ad 100644--- a/src/Plugins/Widgets.Slider/StartupApplication.cs+++ b/src/Plugins/Widgets.Slider/StartupApplication.cs@@ -18,7 +18,7 @@ public class StartupApplication : IStartupApplicationpublic int Priority => 10;- public void Configure(IApplicationBuilder application, IWebHostEnvironment webHostEnvironment)+ public void Configure(WebApplication application, IWebHostEnvironment webHostEnvironment){}diff --git a/src/Tests/Grand.Data.Tests/MongoDb/CoreTestConfiguration.cs b/src/Tests/Grand.Data.Tests/MongoDb/CoreTestConfiguration.csindex 9204a5e9a..4461b57e0 100644--- a/src/Tests/Grand.Data.Tests/MongoDb/CoreTestConfiguration.cs+++ b/src/Tests/Grand.Data.Tests/MongoDb/CoreTestConfiguration.cs@@ -16,12 +16,9 @@using MongoDB.Driver;using MongoDB.Driver.Core.Clusters;using MongoDB.Driver.Core.Configuration;-using MongoDB.Driver.Core.Servers;-using MongoDB.Driver.Core.WireProtocol.Messages.Encoders;using NUnit.Framework;using System.Diagnostics;using System.Reflection;-using System.Security.Cryptography.X509Certificates;namespace Grand.Data.Tests.MongoDb;@@ -68,23 +65,6 @@ public static class CoreTestConfiguration.ConfigureCluster(c =>c.With(serverSelectionTimeout: TimeSpan.FromMilliseconds(int.Parse(serverSelectionTimeoutString))));- if (ConnectionString.Tls.HasValue && ConnectionString.Tls.Value)- {- var certificateFilename = Environment.GetEnvironmentVariable("MONGO_SSL_CERT_FILE");- if (certificateFilename != null)- builder.ConfigureSsl(ssl =>- {- var password = Environment.GetEnvironmentVariable("MONGO_SSL_CERT_PASS");- X509Certificate cert;- if (password == null)- cert = new X509Certificate2(certificateFilename);- else- cert = new X509Certificate2(certificateFilename, password);- return ssl.With(- clientCertificates: new[] { cert });- });- }-return ConfigureLogging(builder);}@@ -106,7 +86,7 @@ public static class CoreTestConfigurationvar hasWritableServer = 0;var builder = ConfigureCluster();var cluster = builder.BuildCluster();-+if (TraceSource != null)TraceSource.TraceEvent(TraceEventType.Information, 0, "CreateCluster: initializing cluster.");diff --git a/src/Web/Grand.Web.Admin/Startup/StartupApplication.cs b/src/Web/Grand.Web.Admin/Startup/StartupApplication.csindex e2c565488..1f9084504 100644--- a/src/Web/Grand.Web.Admin/Startup/StartupApplication.cs+++ b/src/Web/Grand.Web.Admin/Startup/StartupApplication.cs@@ -62,7 +62,7 @@ public class StartupApplication : IStartupApplicationservices.AddScoped<IAreaViewFactory, AdminAreaViewFactory>();}- public void Configure(IApplicationBuilder application, IWebHostEnvironment webHostEnvironment)+ public void Configure(WebApplication application, IWebHostEnvironment webHostEnvironment){}diff --git a/src/Web/Grand.Web.Common/Binders/CustomAttributesBinder.cs b/src/Web/Grand.Web.Common/Binders/CustomAttributesBinder.csindex 2e71b51d3..afa1d98f9 100644--- a/src/Web/Grand.Web.Common/Binders/CustomAttributesBinder.cs+++ b/src/Web/Grand.Web.Common/Binders/CustomAttributesBinder.cs@@ -8,7 +8,7 @@ public class CustomAttributesBinder : IModelBinder{public Task BindModelAsync(ModelBindingContext bindingContext){- if (bindingContext == null) throw new ArgumentNullException(nameof(bindingContext));+ ArgumentNullException.ThrowIfNull(bindingContext);if (bindingContext.HttpContext.Request.HasFormContentType){diff --git a/src/Web/Grand.Web.Common/Infrastructure/ApplicationBuilderExtensions.cs b/src/Web/Grand.Web.Common/Infrastructure/ApplicationBuilderExtensions.csindex 20dc168cf..afddf93f5 100644--- a/src/Web/Grand.Web.Common/Infrastructure/ApplicationBuilderExtensions.cs+++ b/src/Web/Grand.Web.Common/Infrastructure/ApplicationBuilderExtensions.cs@@ -29,11 +29,10 @@ public static class ApplicationBuilderExtensions/// Add exception handling/// </summary>/// <param name="application">Builder for configuring an application's request pipeline</param>- public static void UseGrandExceptionHandler(this IApplicationBuilder application)+ public static void UseGrandExceptionHandler(this WebApplication application){- var serviceProvider = application.ApplicationServices;- var appConfig = serviceProvider.GetRequiredService<AppConfig>();- var hostingEnvironment = serviceProvider.GetRequiredService<IWebHostEnvironment>();+ var appConfig = application.Services.GetRequiredService<AppConfig>();+ var hostingEnvironment = application.Services.GetRequiredService<IWebHostEnvironment>();var useDetailedExceptionPage = appConfig.DisplayFullErrorStack || hostingEnvironment.IsDevelopment();if (useDetailedExceptionPage)//get detailed exceptions for developing and testing purposes@@ -83,7 +82,7 @@ public static class ApplicationBuilderExtensions/// Adds a special handler that checks for responses with the 404 status code that do not have a body/// </summary>/// <param name="application">Builder for configuring an application's request pipeline</param>- public static void UsePageNotFound(this IApplicationBuilder application)+ public static void UsePageNotFound(this WebApplication application){application.UseStatusCodePages(async context =>{@@ -112,7 +111,7 @@ public static class ApplicationBuilderExtensions/// Adds a special handler that checks for responses with the 400 status code (bad request)/// </summary>/// <param name="application">Builder for configuring an application's request pipeline</param>- public static void UseBadRequestResult(this IApplicationBuilder application)+ public static void UseBadRequestResult(this WebApplication application){application.UseStatusCodePages(context =>{@@ -135,7 +134,7 @@ public static class ApplicationBuilderExtensions/// Configure authentication/// </summary>/// <param name="application">Builder for configuring an application's request pipeline</param>- public static void UseGrandAuthentication(this IApplicationBuilder application)+ public static void UseGrandAuthentication(this WebApplication application){application.UseAuthentication();application.UseAuthorization();@@ -145,11 +144,11 @@ public static class ApplicationBuilderExtensions/// Configure MVC endpoint/// </summary>/// <param name="application">Builder for configuring an application's request pipeline</param>- public static void UseGrandEndpoints(this IApplicationBuilder application)+ public static void UseGrandEndpoints(this WebApplication application){application.UseEndpoints(endpoints =>{- var typeSearcher = endpoints.ServiceProvider.GetRequiredService<ITypeSearcher>();+ var typeSearcher = application.Services.GetRequiredService<ITypeSearcher>();var endpointProviders = typeSearcher.ClassesOfType<IEndpointProvider>();var instances = endpointProviders.Where(PluginExtensions.OnlyInstalledPlugins)@@ -165,7 +164,7 @@ public static class ApplicationBuilderExtensions/// Configure MVC endpoint/// </summary>/// <param name="application">Builder for configuring an application's request pipeline</param>- public static void UseGrandDetection(this IApplicationBuilder application)+ public static void UseGrandDetection(this WebApplication application){application.UseDetection();}@@ -175,7 +174,7 @@ public static class ApplicationBuilderExtensions/// </summary>/// <param name="application">Builder for configuring an application's request pipeline</param>/// <param name="appConfig">AppConfig</param>- public static void UseGrandStaticFiles(this IApplicationBuilder application, AppConfig appConfig)+ public static void UseGrandStaticFiles(this WebApplication application, AppConfig appConfig){//static filesapplication.UseStaticFiles(new StaticFileOptions {@@ -185,7 +184,7 @@ public static class ApplicationBuilderExtensionsctx.Context.Response.Headers.Append(HeaderNames.CacheControl, appConfig.StaticFilesCacheControl);}});- var webHostEnvironment = application.ApplicationServices.GetRequiredService<IWebHostEnvironment>();+ var webHostEnvironment = application.Services.GetRequiredService<IWebHostEnvironment>();var pluginsPath = Path.Combine(webHostEnvironment.ContentRootPath, CommonPath.Plugins);//plugins@@ -206,7 +205,7 @@ public static class ApplicationBuilderExtensions/// Configure UseForwardedHeaders/// </summary>/// <param name="application">Builder for configuring an application's request pipeline</param>- public static void UseGrandForwardedHeaders(this IApplicationBuilder application)+ public static void UseGrandForwardedHeaders(this WebApplication application){application.UseForwardedHeaders(new ForwardedHeadersOptions {ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto@@ -217,7 +216,7 @@ public static class ApplicationBuilderExtensions/// Configure Health checks/// </summary>/// <param name="application">Builder for configuring an application's request pipeline</param>- public static void UseGrandHealthChecks(this IApplicationBuilder application)+ public static void UseGrandHealthChecks(this WebApplication application){application.UseHealthChecks("/health/live");}@@ -226,7 +225,7 @@ public static class ApplicationBuilderExtensions/// Configures the default security headers for your application./// </summary>/// <param name="application">Builder for configuring an application's request pipeline</param>- public static void UseDefaultSecurityHeaders(this IApplicationBuilder application)+ public static void UseDefaultSecurityHeaders(this WebApplication application){var policyCollection = new HeaderPolicyCollection().AddXssProtectionBlock()@@ -273,7 +272,7 @@ public static class ApplicationBuilderExtensions/// Configure middleware checking whether database is installed/// </summary>/// <param name="application">Builder for configuring an application's request pipeline</param>- public static void UseInstallUrl(this IApplicationBuilder application)+ public static void UseInstallUrl(this WebApplication application){application.UseMiddleware<InstallUrlMiddleware>();}@@ -282,7 +281,7 @@ public static class ApplicationBuilderExtensions/// Configures whether use or not the Header X-Powered-By and its value./// </summary>/// <param name="application">Builder for configuring an application's request pipeline</param>- public static void UsePoweredBy(this IApplicationBuilder application)+ public static void UsePoweredBy(this WebApplication application){application.UseMiddleware<PoweredByMiddleware>();}diff --git a/src/Web/Grand.Web.Common/Startup/AuthenticationStartup.cs b/src/Web/Grand.Web.Common/Startup/AuthenticationStartup.csindex c939421db..c0626ea0a 100644--- a/src/Web/Grand.Web.Common/Startup/AuthenticationStartup.cs+++ b/src/Web/Grand.Web.Common/Startup/AuthenticationStartup.cs@@ -34,7 +34,7 @@ public class AuthenticationStartup : IStartupApplication/// </summary>/// <param name="application">Builder for configuring an application's request pipeline</param>/// <param name="webHostEnvironment">WebHostEnvironment</param>- public void Configure(IApplicationBuilder application, IWebHostEnvironment webHostEnvironment)+ public void Configure(WebApplication application, IWebHostEnvironment webHostEnvironment){//check whether database is installedif (!DataSettingsManager.DatabaseIsInstalled())diff --git a/src/Web/Grand.Web.Common/Startup/DbCheckStartup.cs b/src/Web/Grand.Web.Common/Startup/DbCheckStartup.csindex 932fd97a3..d14c22645 100644--- a/src/Web/Grand.Web.Common/Startup/DbCheckStartup.cs+++ b/src/Web/Grand.Web.Common/Startup/DbCheckStartup.cs@@ -14,13 +14,12 @@ public class DbCheckStartup : IStartupApplicationpublic int Priority => 0;public bool BeforeConfigure => false;- public void Configure(IApplicationBuilder application, IWebHostEnvironment webHostEnvironment)+ public void Configure(WebApplication application, IWebHostEnvironment webHostEnvironment){if (!DataSettingsManager.DatabaseIsInstalled())return;- var serviceProvider = application.ApplicationServices;- var performanceConfig = serviceProvider.GetRequiredService<PerformanceConfig>();+ var performanceConfig = application.Services.GetRequiredService<PerformanceConfig>();if (!performanceConfig.IgnoreDbVersionCheckMiddleware)application.UseMiddleware<DbVersionCheckMiddleware>();diff --git a/src/Web/Grand.Web.Common/Startup/ErrorHandlerStartup.cs b/src/Web/Grand.Web.Common/Startup/ErrorHandlerStartup.csindex 3f458c4d2..061d8b9c5 100644--- a/src/Web/Grand.Web.Common/Startup/ErrorHandlerStartup.cs+++ b/src/Web/Grand.Web.Common/Startup/ErrorHandlerStartup.cs@@ -26,7 +26,7 @@ public class ErrorHandlerStartup : IStartupApplication/// </summary>/// <param name="application">Builder for configuring an application's request pipeline</param>/// <param name="webHostEnvironment">WebHostEnvironment</param>- public void Configure(IApplicationBuilder application, IWebHostEnvironment webHostEnvironment)+ public void Configure(WebApplication application, IWebHostEnvironment webHostEnvironment){//exception handlingapplication.UseGrandExceptionHandler();diff --git a/src/Web/Grand.Web.Common/Startup/ForwardedHeadersStartup.cs b/src/Web/Grand.Web.Common/Startup/ForwardedHeadersStartup.csindex 4253c4fa2..85fb94856 100644--- a/src/Web/Grand.Web.Common/Startup/ForwardedHeadersStartup.cs+++ b/src/Web/Grand.Web.Common/Startup/ForwardedHeadersStartup.cs@@ -25,14 +25,13 @@ public class ForwardedHeadersStartup : IStartupApplication/// </summary>/// <param name="application">Builder for configuring an application's request pipeline</param>/// <param name="webHostEnvironment">WebHostEnvironment</param>- public void Configure(IApplicationBuilder application, IWebHostEnvironment webHostEnvironment)+ public void Configure(WebApplication application, IWebHostEnvironment webHostEnvironment){//check whether database is installedif (!DataSettingsManager.DatabaseIsInstalled())return;- var serviceProvider = application.ApplicationServices;- var securityConfig = serviceProvider.GetRequiredService<SecurityConfig>();+ var securityConfig = application.Services.GetRequiredService<SecurityConfig>();if (securityConfig.ForceUseHTTPS)application.Use((context, next) =>{diff --git a/src/Web/Grand.Web.Common/Startup/GrandCommonStartup.cs b/src/Web/Grand.Web.Common/Startup/GrandCommonStartup.csindex 59bfc99e3..63e74597d 100644--- a/src/Web/Grand.Web.Common/Startup/GrandCommonStartup.cs+++ b/src/Web/Grand.Web.Common/Startup/GrandCommonStartup.cs@@ -66,13 +66,12 @@ public class GrandCommonStartup : IStartupApplication/// </summary>/// <param name="application">Builder for configuring an application's request pipeline</param>/// <param name="webHostEnvironment">WebHostEnvironment</param>- public void Configure(IApplicationBuilder application, IWebHostEnvironment webHostEnvironment)+ public void Configure(WebApplication application, IWebHostEnvironment webHostEnvironment){- var serviceProvider = application.ApplicationServices;- var appConfig = serviceProvider.GetRequiredService<AppConfig>();- var performanceConfig = serviceProvider.GetRequiredService<PerformanceConfig>();- var securityConfig = serviceProvider.GetRequiredService<SecurityConfig>();- var featureFlagsConfig = serviceProvider.GetRequiredService<FeatureFlagsConfig>();+ var appConfig = application.Services.GetRequiredService<AppConfig>();+ var performanceConfig = application.Services.GetRequiredService<PerformanceConfig>();+ var securityConfig = application.Services.GetRequiredService<SecurityConfig>();+ var featureFlagsConfig = application.Services.GetRequiredService<FeatureFlagsConfig>();//add HealthChecksapplication.UseGrandHealthChecks();diff --git a/src/Web/Grand.Web.Common/Startup/GrandMvcStartup.cs b/src/Web/Grand.Web.Common/Startup/GrandMvcStartup.csindex 0c1b323e0..f88f03bca 100644--- a/src/Web/Grand.Web.Common/Startup/GrandMvcStartup.cs+++ b/src/Web/Grand.Web.Common/Startup/GrandMvcStartup.cs@@ -34,7 +34,7 @@ public class GrandMvcStartup : IStartupApplication/// </summary>/// <param name="application">Builder for configuring an application's request pipeline</param>/// <param name="webHostEnvironment">WebHostEnvironment</param>- public void Configure(IApplicationBuilder application, IWebHostEnvironment webHostEnvironment)+ public void Configure(WebApplication application, IWebHostEnvironment webHostEnvironment){//endpoint routingapplication.UseGrandEndpoints();diff --git a/src/Web/Grand.Web.Common/Startup/HostFilteringStartup.cs b/src/Web/Grand.Web.Common/Startup/HostFilteringStartup.csindex e51c6faf0..bac6dec16 100644--- a/src/Web/Grand.Web.Common/Startup/HostFilteringStartup.cs+++ b/src/Web/Grand.Web.Common/Startup/HostFilteringStartup.cs@@ -35,7 +35,7 @@ public class HostFilteringStartup : IStartupApplication/// </summary>/// <param name="application">Builder for configuring an application's request pipeline</param>/// <param name="webHostEnvironment">WebHostEnvironment</param>- public void Configure(IApplicationBuilder application, IWebHostEnvironment webHostEnvironment)+ public void Configure(WebApplication application, IWebHostEnvironment webHostEnvironment){//check whether database is installedif (!DataSettingsManager.DatabaseIsInstalled())diff --git a/src/Web/Grand.Web.Common/Startup/LoggerStartup.cs b/src/Web/Grand.Web.Common/Startup/LoggerStartup.csindex 6764092f5..fa862193b 100644--- a/src/Web/Grand.Web.Common/Startup/LoggerStartup.cs+++ b/src/Web/Grand.Web.Common/Startup/LoggerStartup.cs@@ -28,13 +28,13 @@ public class LoggerStartup : IStartupApplication/// </summary>/// <param name="application">Builder for configuring an application's request pipeline</param>/// <param name="webHostEnvironment">WebHostEnvironment</param>- public void Configure(IApplicationBuilder application, IWebHostEnvironment webHostEnvironment)+ public void Configure(WebApplication application, IWebHostEnvironment webHostEnvironment){//check whether database is installedif (!DataSettingsManager.DatabaseIsInstalled())return;- var appConfig = application.ApplicationServices.GetRequiredService<AppConfig>();+ var appConfig = application.Services.GetRequiredService<AppConfig>();//set context loggingif (appConfig.EnableContextLoggingMiddleware)diff --git a/src/Web/Grand.Web.Common/Startup/StartupApplication.cs b/src/Web/Grand.Web.Common/Startup/StartupApplication.csindex acf098ae9..61643d14d 100644--- a/src/Web/Grand.Web.Common/Startup/StartupApplication.cs+++ b/src/Web/Grand.Web.Common/Startup/StartupApplication.cs@@ -47,7 +47,7 @@ public class StartupApplication : IStartupApplicationRegisterFramework(services);}- public void Configure(IApplicationBuilder application, IWebHostEnvironment webHostEnvironment)+ public void Configure(WebApplication application, IWebHostEnvironment webHostEnvironment){}diff --git a/src/Web/Grand.Web.Common/Startup/UrlRewriteStartup.cs b/src/Web/Grand.Web.Common/Startup/UrlRewriteStartup.csindex ed49fbc2e..211406f74 100644--- a/src/Web/Grand.Web.Common/Startup/UrlRewriteStartup.cs+++ b/src/Web/Grand.Web.Common/Startup/UrlRewriteStartup.cs@@ -13,6 +13,8 @@ namespace Grand.Web.Common.Startup;/// </summary>public class UrlRewriteStartup : IStartupApplication{+ private const string UrlRewriteFilePath = "App_Data/UrlRewrite.xml";+/// <summary>/// Add and configure any of the middleware/// </summary>@@ -27,37 +29,40 @@ public class UrlRewriteStartup : IStartupApplication/// </summary>/// <param name="application">Builder for configuring an application's request pipeline</param>/// <param name="webHostEnvironment">WebHostEnvironment</param>- public void Configure(IApplicationBuilder application, IWebHostEnvironment webHostEnvironment)+ public void Configure(WebApplication application, IWebHostEnvironment webHostEnvironment){- var serviceProvider = application.ApplicationServices;- var urlConfig = serviceProvider.GetRequiredService<UrlRewriteConfig>();+ var urlConfig = application.Services.GetRequiredService<UrlRewriteConfig>();var urlRewriteOptions = new RewriteOptions();- var rewriteOptions = false;- if (urlConfig.UseUrlRewrite)- if (File.Exists("App_Data/UrlRewrite.xml"))- {- using var streamReader = File.OpenText("App_Data/UrlRewrite.xml");- rewriteOptions = true;- urlRewriteOptions.AddIISUrlRewrite(streamReader);- }++ ConfigureUrlRewriteOptions(urlRewriteOptions, urlConfig);+ ConfigureHttpsOptions(urlRewriteOptions, urlConfig);- if (urlConfig.UrlRewriteHttpsOptions)+ if (urlRewriteOptions.Rules.Count > 0)+ {+ application.UseRewriter(urlRewriteOptions);+ }+ }+ private void ConfigureUrlRewriteOptions(RewriteOptions options, UrlRewriteConfig config)+ {+ if (config.UseUrlRewrite && File.Exists(UrlRewriteFilePath)){- rewriteOptions = true;- urlRewriteOptions.AddRedirectToHttps(urlConfig.UrlRewriteHttpsOptionsStatusCode,- urlConfig.UrlRewriteHttpsOptionsPort);+ using var streamReader = File.OpenText(UrlRewriteFilePath);+ options.AddIISUrlRewrite(streamReader);}+ }- if (urlConfig.UrlRedirectToHttpsPermanent)+ private void ConfigureHttpsOptions(RewriteOptions options, UrlRewriteConfig config)+ {+ if (config.UrlRewriteHttpsOptions){- rewriteOptions = true;- urlRewriteOptions.AddRedirectToHttpsPermanent();+ options.AddRedirectToHttps(config.UrlRewriteHttpsOptionsStatusCode, config.UrlRewriteHttpsOptionsPort);}- if (rewriteOptions)- application.UseRewriter(urlRewriteOptions);+ if (config.UrlRedirectToHttpsPermanent)+ {+ options.AddRedirectToHttpsPermanent();+ }}-/// <summary>/// Gets order of this startup configuration implementation/// </summary>diff --git a/src/Web/Grand.Web.Vendor/Startup/StartupApplication.cs b/src/Web/Grand.Web.Vendor/Startup/StartupApplication.csindex 86e255062..8eadd395e 100644--- a/src/Web/Grand.Web.Vendor/Startup/StartupApplication.cs+++ b/src/Web/Grand.Web.Vendor/Startup/StartupApplication.cs@@ -23,7 +23,7 @@ public class StartupApplication : IStartupApplicationservices.AddScoped<IVendorReviewViewModelService, VendorReviewViewModelService>();}- public void Configure(IApplicationBuilder application, IWebHostEnvironment webHostEnvironment)+ public void Configure(WebApplication application, IWebHostEnvironment webHostEnvironment){}diff --git a/src/Web/Grand.Web/Roslyn/UseForwardedHeaders.csx b/src/Web/Grand.Web/Roslyn/UseForwardedHeaders.csxindex d68e74d00..18a79157a 100644--- a/src/Web/Grand.Web/Roslyn/UseForwardedHeaders.csx+++ b/src/Web/Grand.Web/Roslyn/UseForwardedHeaders.csx@@ -18,7 +18,7 @@ public class StartupApplication : IStartupApplicationpublic void ConfigureServices(IServiceCollection services, IConfiguration configuration){}- public void Configure(IApplicationBuilder application, IWebHostEnvironment webHostEnvironment)+ public void Configure(WebApplication application, IWebHostEnvironment webHostEnvironment){var forwardedHeadersOptions = new ForwardedHeadersOptions{