diff --git a/services/ordering/src/EShopOnAbp.OrderingService.Application.Contracts/EShopOnAbp.OrderingService.Application.Contracts.csproj b/services/ordering/src/EShopOnAbp.OrderingService.Application.Contracts/EShopOnAbp.OrderingService.Application.Contracts.csproj index 0ec41512..5fb73983 100644 --- a/services/ordering/src/EShopOnAbp.OrderingService.Application.Contracts/EShopOnAbp.OrderingService.Application.Contracts.csproj +++ b/services/ordering/src/EShopOnAbp.OrderingService.Application.Contracts/EShopOnAbp.OrderingService.Application.Contracts.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/services/ordering/src/EShopOnAbp.OrderingService.Application/EShopOnAbp.OrderingService.Application.csproj b/services/ordering/src/EShopOnAbp.OrderingService.Application/EShopOnAbp.OrderingService.Application.csproj index bf9b5e44..c61705a3 100644 --- a/services/ordering/src/EShopOnAbp.OrderingService.Application/EShopOnAbp.OrderingService.Application.csproj +++ b/services/ordering/src/EShopOnAbp.OrderingService.Application/EShopOnAbp.OrderingService.Application.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/services/ordering/src/EShopOnAbp.OrderingService.Domain.Shared/EShopOnAbp.OrderingService.Domain.Shared.csproj b/services/ordering/src/EShopOnAbp.OrderingService.Domain.Shared/EShopOnAbp.OrderingService.Domain.Shared.csproj index 1a3a37e9..ff5d9dde 100644 --- a/services/ordering/src/EShopOnAbp.OrderingService.Domain.Shared/EShopOnAbp.OrderingService.Domain.Shared.csproj +++ b/services/ordering/src/EShopOnAbp.OrderingService.Domain.Shared/EShopOnAbp.OrderingService.Domain.Shared.csproj @@ -9,11 +9,11 @@ - + - + diff --git a/services/ordering/src/EShopOnAbp.OrderingService.Domain/EShopOnAbp.OrderingService.Domain.csproj b/services/ordering/src/EShopOnAbp.OrderingService.Domain/EShopOnAbp.OrderingService.Domain.csproj index e359b1a2..1459e266 100644 --- a/services/ordering/src/EShopOnAbp.OrderingService.Domain/EShopOnAbp.OrderingService.Domain.csproj +++ b/services/ordering/src/EShopOnAbp.OrderingService.Domain/EShopOnAbp.OrderingService.Domain.csproj @@ -8,7 +8,7 @@ - + diff --git a/services/ordering/src/EShopOnAbp.OrderingService.EntityFrameworkCore/EShopOnAbp.OrderingService.EntityFrameworkCore.csproj b/services/ordering/src/EShopOnAbp.OrderingService.EntityFrameworkCore/EShopOnAbp.OrderingService.EntityFrameworkCore.csproj index bb680d11..b59f7d14 100644 --- a/services/ordering/src/EShopOnAbp.OrderingService.EntityFrameworkCore/EShopOnAbp.OrderingService.EntityFrameworkCore.csproj +++ b/services/ordering/src/EShopOnAbp.OrderingService.EntityFrameworkCore/EShopOnAbp.OrderingService.EntityFrameworkCore.csproj @@ -3,17 +3,17 @@ - net6.0 + net7.0 EShopOnAbp.OrderingService - + - + runtime; build; native; contentfiles; analyzers compile; contentFiles; build; buildMultitargeting; buildTransitive; analyzers; native diff --git a/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Client/EShopOnAbp.OrderingService.HttpApi.Client.csproj b/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Client/EShopOnAbp.OrderingService.HttpApi.Client.csproj index 9ff7f969..af20aa10 100644 --- a/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Client/EShopOnAbp.OrderingService.HttpApi.Client.csproj +++ b/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Client/EShopOnAbp.OrderingService.HttpApi.Client.csproj @@ -8,7 +8,7 @@ - + diff --git a/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/Dockerfile b/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/Dockerfile index 24d9aae4..57ba0373 100644 --- a/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/Dockerfile +++ b/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/Dockerfile @@ -1,9 +1,9 @@ -FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base +FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base WORKDIR /app EXPOSE 80 EXPOSE 443 -FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build WORKDIR /src # It's important to keep lines from here down to "COPY . ." identical in all Dockerfiles diff --git a/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/Dockerfile.local b/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/Dockerfile.local index a4e919b7..799b8f29 100644 --- a/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/Dockerfile.local +++ b/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/Dockerfile.local @@ -1,4 +1,4 @@ - FROM mcr.microsoft.com/dotnet/aspnet:6.0 - COPY bin/Release/net6.0/publish/ app/ + FROM mcr.microsoft.com/dotnet/aspnet:7.0 + COPY bin/Release/net7.0/publish/ app/ WORKDIR /app ENTRYPOINT ["dotnet", "EShopOnAbp.OrderingService.HttpApi.Host.dll"] \ No newline at end of file diff --git a/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/EShopOnAbp.OrderingService.HttpApi.Host.csproj b/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/EShopOnAbp.OrderingService.HttpApi.Host.csproj index d9ab54ad..ab97dc09 100644 --- a/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/EShopOnAbp.OrderingService.HttpApi.Host.csproj +++ b/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/EShopOnAbp.OrderingService.HttpApi.Host.csproj @@ -3,15 +3,15 @@ - net6.0 + net7.0 EShopOnAbp.OrderingService true EShopOnAbp.OrderingService-c2d31439-b723-48e2-b061-5ebd7aeb6010 - - + + diff --git a/services/ordering/src/EShopOnAbp.OrderingService.HttpApi/EShopOnAbp.OrderingService.HttpApi.csproj b/services/ordering/src/EShopOnAbp.OrderingService.HttpApi/EShopOnAbp.OrderingService.HttpApi.csproj index 324b7921..2c123422 100644 --- a/services/ordering/src/EShopOnAbp.OrderingService.HttpApi/EShopOnAbp.OrderingService.HttpApi.csproj +++ b/services/ordering/src/EShopOnAbp.OrderingService.HttpApi/EShopOnAbp.OrderingService.HttpApi.csproj @@ -3,12 +3,12 @@ - net6.0 + net7.0 EShopOnAbp.OrderingService - + diff --git a/services/ordering/test/EShopOnAbp.OrderingService.Application.Tests/EShopOnAbp.OrderingService.Application.Tests.csproj b/services/ordering/test/EShopOnAbp.OrderingService.Application.Tests/EShopOnAbp.OrderingService.Application.Tests.csproj index f1955b95..6aa70922 100644 --- a/services/ordering/test/EShopOnAbp.OrderingService.Application.Tests/EShopOnAbp.OrderingService.Application.Tests.csproj +++ b/services/ordering/test/EShopOnAbp.OrderingService.Application.Tests/EShopOnAbp.OrderingService.Application.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 EShopOnAbp.OrderingService diff --git a/services/ordering/test/EShopOnAbp.OrderingService.Domain.Tests/EShopOnAbp.OrderingService.Domain.Tests.csproj b/services/ordering/test/EShopOnAbp.OrderingService.Domain.Tests/EShopOnAbp.OrderingService.Domain.Tests.csproj index f7d11f99..ee40d718 100644 --- a/services/ordering/test/EShopOnAbp.OrderingService.Domain.Tests/EShopOnAbp.OrderingService.Domain.Tests.csproj +++ b/services/ordering/test/EShopOnAbp.OrderingService.Domain.Tests/EShopOnAbp.OrderingService.Domain.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 EShopOnAbp.OrderingService diff --git a/services/ordering/test/EShopOnAbp.OrderingService.EntityFrameworkCore.Tests/EShopOnAbp.OrderingService.EntityFrameworkCore.Tests.csproj b/services/ordering/test/EShopOnAbp.OrderingService.EntityFrameworkCore.Tests/EShopOnAbp.OrderingService.EntityFrameworkCore.Tests.csproj index 561a41ab..f16152e1 100644 --- a/services/ordering/test/EShopOnAbp.OrderingService.EntityFrameworkCore.Tests/EShopOnAbp.OrderingService.EntityFrameworkCore.Tests.csproj +++ b/services/ordering/test/EShopOnAbp.OrderingService.EntityFrameworkCore.Tests/EShopOnAbp.OrderingService.EntityFrameworkCore.Tests.csproj @@ -3,16 +3,16 @@ - net6.0 + net7.0 EShopOnAbp.OrderingService - + - + diff --git a/services/ordering/test/EShopOnAbp.OrderingService.HttpApi.Client.ConsoleTestApp/EShopOnAbp.OrderingService.HttpApi.Client.ConsoleTestApp.csproj b/services/ordering/test/EShopOnAbp.OrderingService.HttpApi.Client.ConsoleTestApp/EShopOnAbp.OrderingService.HttpApi.Client.ConsoleTestApp.csproj index a2084a4e..be3264b8 100644 --- a/services/ordering/test/EShopOnAbp.OrderingService.HttpApi.Client.ConsoleTestApp/EShopOnAbp.OrderingService.HttpApi.Client.ConsoleTestApp.csproj +++ b/services/ordering/test/EShopOnAbp.OrderingService.HttpApi.Client.ConsoleTestApp/EShopOnAbp.OrderingService.HttpApi.Client.ConsoleTestApp.csproj @@ -2,12 +2,12 @@ Exe - net6.0 + net7.0 EShopOnAbp.OrderingService - + @@ -25,7 +25,7 @@ - + diff --git a/services/ordering/test/EShopOnAbp.OrderingService.TestBase/EShopOnAbp.OrderingService.TestBase.csproj b/services/ordering/test/EShopOnAbp.OrderingService.TestBase/EShopOnAbp.OrderingService.TestBase.csproj index 88ae56ab..e92baa75 100644 --- a/services/ordering/test/EShopOnAbp.OrderingService.TestBase/EShopOnAbp.OrderingService.TestBase.csproj +++ b/services/ordering/test/EShopOnAbp.OrderingService.TestBase/EShopOnAbp.OrderingService.TestBase.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 EShopOnAbp.OrderingService @@ -14,9 +14,9 @@ - - - + + +