upgrade to 7.0 - Catalog

4 years ago · 383a086a46
15 changed files with 31 additions and 31 deletions
--- 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 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="6.0.0" />
-    <PackageReference Include="Volo.Abp.Authorization" Version="6.0.0" />
+    <PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="7.0.0" />
+    <PackageReference Include="Volo.Abp.Authorization" Version="7.0.0" />
  </ItemGroup>

 </Project>
--- 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 @@
  <Import Project="..\..\..\..\common.props" />

  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
    <RootNamespace>EShopOnAbp.CatalogService</RootNamespace>
  </PropertyGroup>

@ -11,7 +11,7 @@
    <PackageReference Include="Google.Protobuf" Version="3.19.3" />
    <PackageReference Include="Grpc.Core" Version="2.42.0" />
    <PackageReference Include="Grpc.Tools" Version="2.42.0" PrivateAssets="All" />
-    <PackageReference Include="Volo.Abp.Ddd.Application" Version="6.0.0" />
+    <PackageReference Include="Volo.Abp.Ddd.Application" Version="7.0.0" />
  </ItemGroup>

  <ItemGroup>
--- 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 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Volo.Abp.Validation" Version="6.0.0" />
+    <PackageReference Include="Volo.Abp.Validation" Version="7.0.0" />
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.5" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.0" />
  </ItemGroup>

  <ItemGroup>
--- 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 @@
  <Import Project="..\..\..\..\common.props" />

  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
    <RootNamespace>EShopOnAbp.CatalogService</RootNamespace>
  </PropertyGroup>

@ -12,8 +12,8 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Volo.Abp.AutoMapper" Version="6.0.0" />
-    <PackageReference Include="Volo.Abp.Ddd.Domain" Version="6.0.0" />
+    <PackageReference Include="Volo.Abp.AutoMapper" Version="7.0.0" />
+    <PackageReference Include="Volo.Abp.Ddd.Domain" Version="7.0.0" />
  </ItemGroup>

 </Project>
--- 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 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Volo.Abp.Http.Client" Version="6.0.0" />
+    <PackageReference Include="Volo.Abp.Http.Client" Version="7.0.0" />
  </ItemGroup>

  <ItemGroup>
--- 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
--- 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"]
--- 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 @@
  <Import Project="..\..\..\..\common.props" />

  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
    <RootNamespace>EShopOnAbp.CatalogService</RootNamespace>
    <PreserveCompilationReferences>true</PreserveCompilationReferences>
    <UserSecretsId>EShopOnAbp.CatalogService-4681b4fd-151f-4221-84a4-929d86723e4c</UserSecretsId>
--- 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 @@
  <Import Project="..\..\..\..\common.props" />

  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
    <RootNamespace>EShopOnAbp.CatalogService</RootNamespace>
  </PropertyGroup>

@ -12,7 +12,7 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="6.0.0" />
+    <PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="7.0.0" />
  </ItemGroup>

 </Project>
--- 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 @@
  <Import Project="..\..\..\..\common.props" />

  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
    <RootNamespace>EShopOnAbp.CatalogService</RootNamespace>
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Volo.Abp.MongoDB" Version="6.0.0" />
+    <PackageReference Include="Volo.Abp.MongoDB" Version="7.0.0" />
    <ProjectReference Include="..\EShopOnAbp.CatalogService.Domain\EShopOnAbp.CatalogService.Domain.csproj" />
  </ItemGroup>

--- 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 @@
  <Import Project="..\..\..\..\common.props" />

  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
    <RootNamespace>EShopOnAbp.CatalogService</RootNamespace>
  </PropertyGroup>

--- 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 @@
  <Import Project="..\..\..\..\common.props" />

  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
    <RootNamespace>EShopOnAbp.CatalogService</RootNamespace>
  </PropertyGroup>

--- 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 @@

  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
  </PropertyGroup>

  <ItemGroup>
@ -19,13 +19,13 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Volo.Abp.Http.Client.IdentityModel" Version="6.0.0" />
+    <PackageReference Include="Volo.Abp.Http.Client.IdentityModel" Version="7.0.0" />
    <ProjectReference Include="..\..\src\EShopOnAbp.CatalogService.HttpApi.Client\EShopOnAbp.CatalogService.HttpApi.Client.csproj" />
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.0" />
  </ItemGroup>

 </Project>
--- 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 @@
  <Import Project="..\..\..\..\common.props" />

  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
    <RootNamespace>EShopOnAbp.CatalogService</RootNamespace>
  </PropertyGroup>

--- 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 @@
  <Import Project="..\..\..\..\common.props" />

  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
    <RootNamespace>EShopOnAbp.CatalogService</RootNamespace>
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Volo.Abp.TestBase" Version="6.0.0" />
-    <PackageReference Include="Volo.Abp.Autofac" Version="6.0.0" />
-    <PackageReference Include="Volo.Abp.Authorization" Version="6.0.0" />
-    <PackageReference Include="Volo.Abp.BackgroundJobs.Abstractions" Version="6.0.0" />
+    <PackageReference Include="Volo.Abp.TestBase" Version="7.0.0" />
+    <PackageReference Include="Volo.Abp.Autofac" Version="7.0.0" />
+    <PackageReference Include="Volo.Abp.Authorization" Version="7.0.0" />
+    <PackageReference Include="Volo.Abp.BackgroundJobs.Abstractions" Version="7.0.0" />
    <ProjectReference Include="..\..\src\EShopOnAbp.CatalogService.Domain\EShopOnAbp.CatalogService.Domain.csproj" />
  </ItemGroup>