diff --git a/services/catalog/src/EShopOnAbp.CatalogService.Application.Contracts/EShopOnAbp.CatalogService.Application.Contracts.csproj b/services/catalog/src/EShopOnAbp.CatalogService.Application.Contracts/EShopOnAbp.CatalogService.Application.Contracts.csproj index 6bff5b6a..b7150fdc 100644 --- a/services/catalog/src/EShopOnAbp.CatalogService.Application.Contracts/EShopOnAbp.CatalogService.Application.Contracts.csproj +++ b/services/catalog/src/EShopOnAbp.CatalogService.Application.Contracts/EShopOnAbp.CatalogService.Application.Contracts.csproj @@ -12,8 +12,8 @@ - - + + diff --git a/services/catalog/src/EShopOnAbp.CatalogService.Application/EShopOnAbp.CatalogService.Application.csproj b/services/catalog/src/EShopOnAbp.CatalogService.Application/EShopOnAbp.CatalogService.Application.csproj index 4a96d3a7..feb8a7fe 100644 --- a/services/catalog/src/EShopOnAbp.CatalogService.Application/EShopOnAbp.CatalogService.Application.csproj +++ b/services/catalog/src/EShopOnAbp.CatalogService.Application/EShopOnAbp.CatalogService.Application.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 EShopOnAbp.CatalogService @@ -11,7 +11,7 @@ - + diff --git a/services/catalog/src/EShopOnAbp.CatalogService.Domain.Shared/EShopOnAbp.CatalogService.Domain.Shared.csproj b/services/catalog/src/EShopOnAbp.CatalogService.Domain.Shared/EShopOnAbp.CatalogService.Domain.Shared.csproj index f941b674..e65ce7b7 100644 --- a/services/catalog/src/EShopOnAbp.CatalogService.Domain.Shared/EShopOnAbp.CatalogService.Domain.Shared.csproj +++ b/services/catalog/src/EShopOnAbp.CatalogService.Domain.Shared/EShopOnAbp.CatalogService.Domain.Shared.csproj @@ -9,11 +9,11 @@ - + - + diff --git a/services/catalog/src/EShopOnAbp.CatalogService.Domain/EShopOnAbp.CatalogService.Domain.csproj b/services/catalog/src/EShopOnAbp.CatalogService.Domain/EShopOnAbp.CatalogService.Domain.csproj index c984e58e..e2c49668 100644 --- a/services/catalog/src/EShopOnAbp.CatalogService.Domain/EShopOnAbp.CatalogService.Domain.csproj +++ b/services/catalog/src/EShopOnAbp.CatalogService.Domain/EShopOnAbp.CatalogService.Domain.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 EShopOnAbp.CatalogService @@ -12,8 +12,8 @@ - - + + diff --git a/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Client/EShopOnAbp.CatalogService.HttpApi.Client.csproj b/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Client/EShopOnAbp.CatalogService.HttpApi.Client.csproj index 9ccbd174..2e384353 100644 --- a/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Client/EShopOnAbp.CatalogService.HttpApi.Client.csproj +++ b/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Client/EShopOnAbp.CatalogService.HttpApi.Client.csproj @@ -12,7 +12,7 @@ - + diff --git a/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/Dockerfile b/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/Dockerfile index 245a8e3f..7f3501e2 100644 --- a/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/Dockerfile +++ b/services/catalog/src/EShopOnAbp.CatalogService.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/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/Dockerfile.local b/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/Dockerfile.local index 1811b197..d9bd39a3 100644 --- a/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/Dockerfile.local +++ b/services/catalog/src/EShopOnAbp.CatalogService.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.CatalogService.HttpApi.Host.dll"] \ No newline at end of file diff --git a/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/EShopOnAbp.CatalogService.HttpApi.Host.csproj b/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/EShopOnAbp.CatalogService.HttpApi.Host.csproj index b7bab860..21faddb0 100644 --- a/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/EShopOnAbp.CatalogService.HttpApi.Host.csproj +++ b/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/EShopOnAbp.CatalogService.HttpApi.Host.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 EShopOnAbp.CatalogService true EShopOnAbp.CatalogService-4681b4fd-151f-4221-84a4-929d86723e4c diff --git a/services/catalog/src/EShopOnAbp.CatalogService.HttpApi/EShopOnAbp.CatalogService.HttpApi.csproj b/services/catalog/src/EShopOnAbp.CatalogService.HttpApi/EShopOnAbp.CatalogService.HttpApi.csproj index b5220bac..4b6fe606 100644 --- a/services/catalog/src/EShopOnAbp.CatalogService.HttpApi/EShopOnAbp.CatalogService.HttpApi.csproj +++ b/services/catalog/src/EShopOnAbp.CatalogService.HttpApi/EShopOnAbp.CatalogService.HttpApi.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 EShopOnAbp.CatalogService @@ -12,7 +12,7 @@ - + diff --git a/services/catalog/src/EShopOnAbp.CatalogService.MongoDB/EShopOnAbp.CatalogService.MongoDB.csproj b/services/catalog/src/EShopOnAbp.CatalogService.MongoDB/EShopOnAbp.CatalogService.MongoDB.csproj index 94e66f57..01f3fd8e 100644 --- a/services/catalog/src/EShopOnAbp.CatalogService.MongoDB/EShopOnAbp.CatalogService.MongoDB.csproj +++ b/services/catalog/src/EShopOnAbp.CatalogService.MongoDB/EShopOnAbp.CatalogService.MongoDB.csproj @@ -3,12 +3,12 @@ - net6.0 + net7.0 EShopOnAbp.CatalogService - + diff --git a/services/catalog/test/EShopOnAbp.CatalogService.Application.Tests/EShopOnAbp.CatalogService.Application.Tests.csproj b/services/catalog/test/EShopOnAbp.CatalogService.Application.Tests/EShopOnAbp.CatalogService.Application.Tests.csproj index 232c02b4..f8388871 100644 --- a/services/catalog/test/EShopOnAbp.CatalogService.Application.Tests/EShopOnAbp.CatalogService.Application.Tests.csproj +++ b/services/catalog/test/EShopOnAbp.CatalogService.Application.Tests/EShopOnAbp.CatalogService.Application.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 EShopOnAbp.CatalogService diff --git a/services/catalog/test/EShopOnAbp.CatalogService.Domain.Tests/EShopOnAbp.CatalogService.Domain.Tests.csproj b/services/catalog/test/EShopOnAbp.CatalogService.Domain.Tests/EShopOnAbp.CatalogService.Domain.Tests.csproj index 448dd3a9..b65179bd 100644 --- a/services/catalog/test/EShopOnAbp.CatalogService.Domain.Tests/EShopOnAbp.CatalogService.Domain.Tests.csproj +++ b/services/catalog/test/EShopOnAbp.CatalogService.Domain.Tests/EShopOnAbp.CatalogService.Domain.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 EShopOnAbp.CatalogService diff --git a/services/catalog/test/EShopOnAbp.CatalogService.HttpApi.Client.ConsoleTestApp/EShopOnAbp.CatalogService.HttpApi.Client.ConsoleTestApp.csproj b/services/catalog/test/EShopOnAbp.CatalogService.HttpApi.Client.ConsoleTestApp/EShopOnAbp.CatalogService.HttpApi.Client.ConsoleTestApp.csproj index becfb3e6..888ca0bc 100644 --- a/services/catalog/test/EShopOnAbp.CatalogService.HttpApi.Client.ConsoleTestApp/EShopOnAbp.CatalogService.HttpApi.Client.ConsoleTestApp.csproj +++ b/services/catalog/test/EShopOnAbp.CatalogService.HttpApi.Client.ConsoleTestApp/EShopOnAbp.CatalogService.HttpApi.Client.ConsoleTestApp.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 @@ -19,13 +19,13 @@ - + - - + + diff --git a/services/catalog/test/EShopOnAbp.CatalogService.MongoDB.Tests/EShopOnAbp.CatalogService.MongoDB.Tests.csproj b/services/catalog/test/EShopOnAbp.CatalogService.MongoDB.Tests/EShopOnAbp.CatalogService.MongoDB.Tests.csproj index a14f5adb..509f167e 100644 --- a/services/catalog/test/EShopOnAbp.CatalogService.MongoDB.Tests/EShopOnAbp.CatalogService.MongoDB.Tests.csproj +++ b/services/catalog/test/EShopOnAbp.CatalogService.MongoDB.Tests/EShopOnAbp.CatalogService.MongoDB.Tests.csproj @@ -3,7 +3,7 @@ - net6.0 + net7.0 EShopOnAbp.CatalogService diff --git a/services/catalog/test/EShopOnAbp.CatalogService.TestBase/EShopOnAbp.CatalogService.TestBase.csproj b/services/catalog/test/EShopOnAbp.CatalogService.TestBase/EShopOnAbp.CatalogService.TestBase.csproj index 9a883a27..cdc02615 100644 --- a/services/catalog/test/EShopOnAbp.CatalogService.TestBase/EShopOnAbp.CatalogService.TestBase.csproj +++ b/services/catalog/test/EShopOnAbp.CatalogService.TestBase/EShopOnAbp.CatalogService.TestBase.csproj @@ -3,15 +3,15 @@ - net6.0 + net7.0 EShopOnAbp.CatalogService - - - - + + + +