upgrade to 7.0 - Cmskit

4 years ago · 64e3821656
14 changed files with 38 additions and 38 deletions
--- a/services/cmskit/src/EShopOnAbp.CmskitService.Application.Contracts/EShopOnAbp.CmskitService.Application.Contracts.csproj
+++ b/services/cmskit/src/EShopOnAbp.CmskitService.Application.Contracts/EShopOnAbp.CmskitService.Application.Contracts.csproj
@ -8,9 +8,9 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="6.0.0" />
-    <PackageReference Include="Volo.Abp.Authorization" Version="6.0.0" />
-    <PackageReference Include="Volo.CmsKit.Application.Contracts" Version="6.0.0" />
+    <PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="7.0.0" />
+    <PackageReference Include="Volo.Abp.Authorization" Version="7.0.0" />
+    <PackageReference Include="Volo.CmsKit.Application.Contracts" Version="7.0.0" />
    <ProjectReference Include="..\EShopOnAbp.CmskitService.Domain.Shared\EShopOnAbp.CmskitService.Domain.Shared.csproj" />
  </ItemGroup>

--- a/services/cmskit/src/EShopOnAbp.CmskitService.Application/EShopOnAbp.CmskitService.Application.csproj
+++ b/services/cmskit/src/EShopOnAbp.CmskitService.Application/EShopOnAbp.CmskitService.Application.csproj
@ -3,14 +3,14 @@
  <Import Project="..\..\..\..\common.props" />

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

  <ItemGroup>
-    <PackageReference Include="Volo.Abp.Ddd.Application" Version="6.0.0" />
-    <PackageReference Include="Volo.Abp.AutoMapper" Version="6.0.0" />
-    <PackageReference Include="Volo.CmsKit.Application" Version="6.0.0" />
+    <PackageReference Include="Volo.Abp.Ddd.Application" Version="7.0.0" />
+    <PackageReference Include="Volo.Abp.AutoMapper" Version="7.0.0" />
+    <PackageReference Include="Volo.CmsKit.Application" Version="7.0.0" />
    <ProjectReference Include="..\EShopOnAbp.CmskitService.Application.Contracts\EShopOnAbp.CmskitService.Application.Contracts.csproj" />
    <ProjectReference Include="..\EShopOnAbp.CmskitService.Domain\EShopOnAbp.CmskitService.Domain.csproj" />
  </ItemGroup>
--- a/services/cmskit/src/EShopOnAbp.CmskitService.Domain.Shared/EShopOnAbp.CmskitService.Domain.Shared.csproj
+++ b/services/cmskit/src/EShopOnAbp.CmskitService.Domain.Shared/EShopOnAbp.CmskitService.Domain.Shared.csproj
@ -9,12 +9,12 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.5" />
-    <PackageReference Include="Volo.CmsKit.Domain.Shared" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.0" />
+    <PackageReference Include="Volo.CmsKit.Domain.Shared" Version="7.0.0" />
  </ItemGroup>

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

  <ItemGroup>
--- a/services/cmskit/src/EShopOnAbp.CmskitService.Domain/EShopOnAbp.CmskitService.Domain.csproj
+++ b/services/cmskit/src/EShopOnAbp.CmskitService.Domain/EShopOnAbp.CmskitService.Domain.csproj
@ -8,8 +8,8 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Volo.Abp.Ddd.Domain" Version="6.0.0" />
-    <PackageReference Include="Volo.CmsKit.Domain" Version="6.0.0" />
+    <PackageReference Include="Volo.Abp.Ddd.Domain" Version="7.0.0" />
+    <PackageReference Include="Volo.CmsKit.Domain" Version="7.0.0" />
    <ProjectReference Include="..\EShopOnAbp.CmskitService.Domain.Shared\EShopOnAbp.CmskitService.Domain.Shared.csproj" />
  </ItemGroup>

--- a/services/cmskit/src/EShopOnAbp.CmskitService.EntityFrameworkCore/EShopOnAbp.CmskitService.EntityFrameworkCore.csproj
+++ b/services/cmskit/src/EShopOnAbp.CmskitService.EntityFrameworkCore/EShopOnAbp.CmskitService.EntityFrameworkCore.csproj
@ -3,19 +3,19 @@
  <Import Project="..\..\..\..\common.props" />

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

  <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.5">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.0">
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
-    <PackageReference Include="Volo.CmsKit.EntityFrameworkCore" Version="6.0.0" />
+    <PackageReference Include="Volo.CmsKit.EntityFrameworkCore" Version="7.0.0" />
  </ItemGroup>

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

  <ItemGroup>
--- a/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Client/EShopOnAbp.CmskitService.HttpApi.Client.csproj
+++ b/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Client/EShopOnAbp.CmskitService.HttpApi.Client.csproj
@ -8,8 +8,8 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Volo.Abp.Http.Client" Version="6.0.0" />
-    <PackageReference Include="Volo.CmsKit.HttpApi.Client" Version="6.0.0" />
+    <PackageReference Include="Volo.Abp.Http.Client" Version="7.0.0" />
+    <PackageReference Include="Volo.CmsKit.HttpApi.Client" Version="7.0.0" />
    <ProjectReference Include="..\EShopOnAbp.CmskitService.Application.Contracts\EShopOnAbp.CmskitService.Application.Contracts.csproj" />
  </ItemGroup>

--- a/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/Dockerfile
+++ b/services/cmskit/src/EShopOnAbp.CmskitService.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/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/Dockerfile.local
+++ b/services/cmskit/src/EShopOnAbp.CmskitService.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.CmskitService.HttpApi.Host.dll"]
--- a/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/EShopOnAbp.CmskitService.HttpApi.Host.csproj
+++ b/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/EShopOnAbp.CmskitService.HttpApi.Host.csproj
@ -3,12 +3,12 @@
  <Import Project="..\..\..\..\common.props" />

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

  <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.5">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.1">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
    </PackageReference>
@ -22,8 +22,8 @@
    <ProjectReference Include="..\EShopOnAbp.CmskitService.Application\EShopOnAbp.CmskitService.Application.csproj" />
    <ProjectReference Include="..\EShopOnAbp.CmskitService.EntityFrameworkCore\EShopOnAbp.CmskitService.EntityFrameworkCore.csproj" />
    <ProjectReference Include="..\EShopOnAbp.CmskitService.HttpApi\EShopOnAbp.CmskitService.HttpApi.csproj" />
-    <PackageReference Include="Volo.Abp.Identity.HttpApi.Client" Version="6.0.0" />
-    <PackageReference Include="Volo.Abp.Http.Client.IdentityModel.Web" Version="6.0.0" />
+    <PackageReference Include="Volo.Abp.Identity.HttpApi.Client" Version="7.0.0" />
+    <PackageReference Include="Volo.Abp.Http.Client.IdentityModel.Web" Version="7.0.0" />
  </ItemGroup>

  <ItemGroup>
--- a/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi/EShopOnAbp.CmskitService.HttpApi.csproj
+++ b/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi/EShopOnAbp.CmskitService.HttpApi.csproj
@ -3,13 +3,13 @@
  <Import Project="..\..\..\..\common.props" />

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

  <ItemGroup>
-    <PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="6.0.0" />
-    <PackageReference Include="Volo.CmsKit.HttpApi" Version="6.0.0" />
+    <PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="7.0.0" />
+    <PackageReference Include="Volo.CmsKit.HttpApi" Version="7.0.0" />
    <ProjectReference Include="..\EShopOnAbp.CmskitService.Application.Contracts\EShopOnAbp.CmskitService.Application.Contracts.csproj" />
  </ItemGroup>

--- a/services/cmskit/test/EShopOnAbp.CmskitService.Application.Tests/EShopOnAbp.CmskitService.Application.Tests.csproj
+++ b/services/cmskit/test/EShopOnAbp.CmskitService.Application.Tests/EShopOnAbp.CmskitService.Application.Tests.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

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

--- a/services/cmskit/test/EShopOnAbp.CmskitService.Domain.Tests/EShopOnAbp.CmskitService.Domain.Tests.csproj
+++ b/services/cmskit/test/EShopOnAbp.CmskitService.Domain.Tests/EShopOnAbp.CmskitService.Domain.Tests.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

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

--- a/services/cmskit/test/EShopOnAbp.CmskitService.EntityFrameworkCore.Tests/EShopOnAbp.CmskitService.EntityFrameworkCore.Tests.csproj
+++ b/services/cmskit/test/EShopOnAbp.CmskitService.EntityFrameworkCore.Tests/EShopOnAbp.CmskitService.EntityFrameworkCore.Tests.csproj
@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">

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

  <ItemGroup>
    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
-    <PackageReference Include="Microsoft.Data.Sqlite" Version="6.0.0" />
-    <PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Data.Sqlite" Version="7.0.0" />
+    <PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="7.0.0" />
    <ProjectReference Include="..\EShopOnAbp.CmskitService.TestBase\EShopOnAbp.CmskitService.TestBase.csproj" />
  </ItemGroup>

--- a/services/cmskit/test/EShopOnAbp.CmskitService.TestBase/EShopOnAbp.CmskitService.TestBase.csproj
+++ b/services/cmskit/test/EShopOnAbp.CmskitService.TestBase/EShopOnAbp.CmskitService.TestBase.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

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

@ -12,9 +12,9 @@
        <PackageReference Include="xunit" Version="2.4.1" />
        <PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
-        <PackageReference Include="Volo.Abp.Autofac" Version="6.0.0" />
-        <PackageReference Include="Volo.Abp.Authorization" Version="6.0.0" />
-        <PackageReference Include="Volo.Abp.TestBase" Version="6.0.0" />
+        <PackageReference Include="Volo.Abp.Autofac" Version="7.0.0" />
+        <PackageReference Include="Volo.Abp.Authorization" Version="7.0.0" />
+        <PackageReference Include="Volo.Abp.TestBase" Version="7.0.0" />
    </ItemGroup>

    <ItemGroup>